Merge branch 'master' of git://git.qemu.org/qemu
commit63bb682a18acc5d2f3219ea96c4d81c1a3b50748
authormalc <av1474@comtv.ru>
Fri, 15 Jun 2012 11:53:34 +0000 (15 15:53 +0400)
committermalc <av1474@comtv.ru>
Fri, 15 Jun 2012 11:53:34 +0000 (15 15:53 +0400)
tree8893d9c687630ab3b8213c934de69bf8e18ae823
parent1417d7e40eaf1418333fb2ec43d0c7f4245b10e7
parent8219314be689f54ff9814e55d619f87b9d66452a
Merge branch 'master' of git://git.qemu.org/qemu