Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Mon, 22 Aug 2011 10:41:12 +0000 (14:41 +0400)
committermalc <av1474@comtv.ru>
Mon, 22 Aug 2011 10:41:12 +0000 (14:41 +0400)
commit1afa194a0a3384c5a8fd150e4335d332c22883cf
tree87d1ca2dbfb03128e628e344a713297131bad7f7
parent157f2662fb4dd8f02885027e47f79fbee83c7b94
parentf1a7104a5f435a1bf2a1158e6f737dbd89e8c153
Merge branch 'master' of git://git.qemu.org/qemu