From af1c5872292058dd3ae3bdae3fd2678501d1b677 Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede@redhat.com>
Date: Sep 08 2012 14:42:09 +0000
Subject: Merge remote-tracking branch 'origin/master' into f18


---

diff --git a/qemu.spec b/qemu.spec
index 9214282..0b08eee 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1046,11 +1046,11 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
-* Sat Sep 10 2012 Hans de Goede <hdegoede@redhat.com> - 2:1.2.0-2
+* Sat Sep  8 2012 Hans de Goede <hdegoede@redhat.com> - 2:1.2.0-2
 - Fix crash on (seamless) migration
 - Sync usbredir live migration patches with upstream
 
-* Fri Sep  9 2012 Hans de Goede <hdegoede@redhat.com> - 2:1.2.0-1
+* Fri Sep  7 2012 Hans de Goede <hdegoede@redhat.com> - 2:1.2.0-1
 - New upstream release 1.2.0 final
 - Add support for Spice seamless migration
 - Add support for Spice dynamic monitors