[qemu/f18: 2/2] Merge branch 'master' into f18

[Adam Jackson]

commit 308e2405ce8dae877a01a215ee3f4f76476451ab
Merge: 021e58e 9acdac9
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Sep 4 15:57:22 2012 -0400

    Merge branch 'master' into f18

 qemu.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---