Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0
authorJustin M. Forbes <jforbes@redhat.com>
Tue, 10 Jan 2012 20:41:17 +0000 (14:41 -0600)
committerJustin M. Forbes <jforbes@redhat.com>
Tue, 10 Jan 2012 20:41:17 +0000 (14:41 -0600)
commit21015e9ebd346a18c2612363e080adae93911cf9
treec8f2d52166fd71d9c6ab7289d2f11c435ad776a7
parent076ae2881e498de1c083f3dd3ee2a945f5621038
parentcbf6d94acfcf8f9db66f77772d89c0c62e1a2f4f
Merge branch 'master' of ssh://git.qemu.org/pub/git/qemu-stable-1.0