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)
commitd44be3dd97df8cbf90937a8e82eac4d2bbedba33
tree146a7b6eebbee1367453fde501d4462ac6d9f8b4
parentd3805d4435ce862a6362b86715e08c9eb2b9e81d
parentd09609a68a66d7515b14bb4c5be7d4d434fb7d0c
Merge branch 'master' of git://git.qemu.org/qemu