[qemu/f18: 2/2] Merge remote-tracking branch 'origin/master' into f18

[Hans de Goede]

commit af1c5872292058dd3ae3bdae3fd2678501d1b677
Merge: fd902e4 3e10261
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Sat Sep 8 16:42:09 2012 +0200

    Merge remote-tracking branch 'origin/master' into f18

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