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 (10 14:41 -0600)
committerJustin M. Forbes <jforbes@redhat.com>
Tue, 10 Jan 2012 20:41:17 +0000 (10 14:41 -0600)

Trivial merge