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)

Trivial merge