]> git.proxmox.com Git - qemu.git/commitdiff
Merge branch 'stable-0.15' of git://git.qemu.org/qemu
authorJustin M. Forbes <jforbes@redhat.com>
Thu, 4 Aug 2011 21:40:07 +0000 (16:40 -0500)
committerJustin M. Forbes <jforbes@redhat.com>
Thu, 4 Aug 2011 21:40:07 +0000 (16:40 -0500)

Trivial merge