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