Merge branch 'master' of git://git.qemu.org/qemu
commitf18318eef8b4b263f4e82a5338c9b2875a6c73c8
authormalc <av1474@comtv.ru>
Mon, 12 Dec 2011 00:12:31 +0000 (12 04:12 +0400)
committermalc <av1474@comtv.ru>
Mon, 12 Dec 2011 00:12:31 +0000 (12 04:12 +0400)
treeb74835b3c982b44e244145453132a53c5d97fafd
parent5bf1356026f920de1158f32bb8472ed120a1131f
parent62ba9f3662c5481f31160daf25474c8f22d6b3d2
Merge branch 'master' of git://git.qemu.org/qemu