Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Tue, 1 Nov 2011 22:16:34 +0000 (02:16 +0400)
committermalc <av1474@comtv.ru>
Tue, 1 Nov 2011 22:16:34 +0000 (02:16 +0400)

Trivial merge