Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Mon, 22 Aug 2011 10:41:12 +0000 (14:41 +0400)
committermalc <av1474@comtv.ru>
Mon, 22 Aug 2011 10:41:12 +0000 (14:41 +0400)

Trivial merge