From 37a4ba020b442335d94724c09c25b01a1ce54f15 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Nov 15 2012 13:45:01 +0000
Subject: fix merge of latest version from f16


---

diff --git a/.gitignore b/.gitignore
index 4322806..a5d0bc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1 @@
-fio-1.41.5.tar.bz2
-/fio-1.43.2.tar.bz2
-/fio-1.44.tar.bz2
-/fio-1.44.1.tar.bz2
-/fio-1.44.3.tar.bz2
-/fio-1.50.tar.bz2
-/fio-1.50.2.tar.bz2
-/fio-1.52.tar.bz2
-/fio-1.53.tar.bz2
-/fio-1.55.tar.bz2
-/fio-1.57.tar.bz2
-/fio-1.58.tar.bz2
-/fio-1.99.12.tar.bz2
-/fio-2.0.tar.bz2
-/fio-2.0.1.tar.bz2
-/fio-2.0.5.tar.gz
-/fio-2.0.5.tar.bz2
-/fio-2.0.6.tar.bz2
-/fio-2.0.8.tar.bz2
+/fio-2.*.tar.bz2
diff --git a/fio.spec b/fio.spec
index 78bf327..01eb1e3 100644
--- a/fio.spec
+++ b/fio.spec
@@ -1,6 +1,6 @@
 Name:		fio
-Version:	2.0.8
-Release:	2%{?dist}
+Version:	2.0.10
+Release:	1%{?dist}
 Summary:	Multithreaded IO generation tool
 
 Group:		Applications/System
@@ -40,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/*
 
 %changelog
+* Fri Oct 12 2012 Eric Sandeen <sandeen@redhat.com> 2.0.10-1 
+- New upstream version
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 83d9fae..0a65f35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83c88a4ef47b14cd86ec3d1152d18b93  fio-2.0.8.tar.bz2
+f282eaf8eb74b78842497d8f9cb40d6b  fio-2.0.10.tar.bz2