Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Fri, 22 Jul 2011 20:50:37 +0000 (00:50 +0400)
committermalc <av1474@comtv.ru>
Fri, 22 Jul 2011 20:50:37 +0000 (00:50 +0400)
commitd3805d4435ce862a6362b86715e08c9eb2b9e81d
tree81a794b007c8b94dacf593ef8e5eaea6e90dcdc0
parentb65bb0e3aee6f2411e5f426200536687c8204a8d
parent209c7732762fc5ef2d784d9746f38f0849780160
Merge branch 'master' of git://git.qemu.org/qemu