From ffada97a59144f27ae620d78ab41c7719ab66180 Mon Sep 17 00:00:00 2001
From: Justin M. Forbes <jforbes@redhat.com>
Date: Oct 19 2010 04:10:48 +0000
Subject: Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/qemu into f14


Conflicts:
	qemu.spec

---

diff --git a/qemu.spec b/qemu.spec
index 294ea6d..e291c14 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -647,6 +647,9 @@ fi
 - Resolve build issues with S390 (#639471)
 - Fix Windows XP on Raw Devices (#631591)
 
+* Tue Oct 05 2010 jkeating - 2:0.13.0-0.7.rc1.1
+- Rebuilt for gcc bug 634757
+
 * Tue Sep 21 2010 Justin M. Forbes <jforbes@redhat.com> - 2:0.13.0-0.7.rc1
 - Flip qxl pci id from unstable to stable (#634535)
 - KSM Fixes from upstream (#558281)