Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Mon, 8 Aug 2011 09:37:44 +0000 (13:37 +0400)
committermalc <av1474@comtv.ru>
Mon, 8 Aug 2011 09:37:44 +0000 (13:37 +0400)
commit15f83d05d300b8400a89f032ccee0ec6f05cdd35
tree7a48577ab755f7221bcd696a68f35616cd1fa296
parentd44be3dd97df8cbf90937a8e82eac4d2bbedba33
parentdacdd6c5487c887b32e8b6f18ff614dabb819f8f
Merge branch 'master' of git://git.qemu.org/qemu