]> git.proxmox.com Git - qemu.git/commitdiff
Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Fri, 5 Aug 2011 06:07:10 +0000 (10:07 +0400)
committermalc <av1474@comtv.ru>
Fri, 5 Aug 2011 06:07:10 +0000 (10:07 +0400)

Trivial merge