[qemu/f18: 2/2] Merge ../master into f18

[Richard W.M. Jones]

commit 6ae593a9b44fa1835e6a14dcb3d24392081da0c3
Merge: af1c587 dbb388c
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed Sep 12 20:00:07 2012 +0100

    Merge ../master into f18

 ...-char-Re-connect-for-tcp_chr_write-unconn.patch |   14 ++++++++++++++
 qemu.spec                                          |   14 +++++++++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---