[qemu: 2/2] merge commit

[Justin M. Forbes]

commit 261b9ddbcd089297868b1f6bb02b0a5bea6c2493
Merge: 357a44f 5ba935a
Author: Justin M. Forbes <jforbes at redhat.com>
Date:   Tue Feb 7 16:18:35 2012 -0600

    merge commit

 qemu.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --cc qemu.spec
index e53df40,e000685..67c87fb
--- a/qemu.spec
+++ b/qemu.spec
@@@ -1,7 -1,7 +1,7 @@@
  Summary: QEMU is a FAST! processor emulator
  Name: qemu
  Version: 1.0
--Release: 4%{?dist}
++Release: 5%{?dist}
  # Epoch because we pushed a qemu-1.0 package
  Epoch: 2
  License: GPLv2+ and LGPLv2+ and BSD
@@@ -742,9 -746,9 +748,12 @@@ f
  %{_mandir}/man1/qemu-img.1*
  
  %changelog
- * Tue Feb 07 2012 Justin M. Forbes <jforbes at redhat.com> - 2:1.0-4
++* Tue Feb 07 2012 Justin M. Forbes <jforbes at redhat.com> - 2:1.0-5
 +- Add support for virtio-scsi
 +
+ * Sun Feb  5 2012 Richard W.M. Jones <rjones at redhat.com> - 2:1.0-4
+ - Require updated ceph for latest librbd with rbd_flush symbol.
+ 
  * Tue Jan 24 2012 Justin M. Forbes <jforbes at redhat.com> - 2:1.0-3
  - Add support for vPMU
  - e1000: bounds packet size against buffer size CVE-2012-0029