]> git.proxmox.com Git - qemu.git/commitdiff
Merge branch 'master' of git+ssh://git.qemu.org/pub/git/qemu-stable-0.14
authorJustin M. Forbes <jforbes@redhat.com>
Tue, 8 Feb 2011 18:41:18 +0000 (12:41 -0600)
committerJustin M. Forbes <jforbes@redhat.com>
Tue, 8 Feb 2011 18:41:18 +0000 (12:41 -0600)

Trivial merge