Merge branch 'master' of git://git.qemu.org/qemu
commit5bf1356026f920de1158f32bb8472ed120a1131f
authormalc <av1474@comtv.ru>
Sun, 11 Dec 2011 20:47:40 +0000 (12 00:47 +0400)
committermalc <av1474@comtv.ru>
Sun, 11 Dec 2011 20:47:40 +0000 (12 00:47 +0400)
tree261d03c024420032f78a40b1b04fcdaccf8dbaee
parentf7e80adf3cc4b99b8230e6474d0518363773915f
parentdaf767b16aeb32e5b9a77066ba130fe723f875ca
Merge branch 'master' of git://git.qemu.org/qemu