[qemu/f14/master: 3/3] Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/qemu into f14

[Justin M. Forbes]

commit ffada97a59144f27ae620d78ab41c7719ab66180
Merge: 35db8c0 3f0f147
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Mon Oct 18 23:10:48 2010 -0500

    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/qemu into f14
    
    Conflicts:
    	qemu.spec

 qemu.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc qemu.spec
index 294ea6d,56c28d2..e291c14
--- a/qemu.spec
+++ b/qemu.spec
@@@ -639,14 -629,9 +639,17 @@@ f
  %{_mandir}/man1/qemu-img.1*
  
  %changelog
 +* Mon Oct 18 2010 Justin M. Forbes <jforbes at redhat.com> - 2:0.13.0-1
 +- Update to 0.13.0 upstream release
 +- Fixes for vhost
 +- Fix mouse in certain guests (#636887)
 +- Fix issues with WinXP guest install (#579348)
 +- 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 at redhat.com> - 2:0.13.0-0.7.rc1
  - Flip qxl pci id from unstable to stable (#634535)
  - KSM Fixes from upstream (#558281)