Merge branch 'master' of git://git.qemu.org/qemu
authormalc <av1474@comtv.ru>
Sun, 11 Dec 2011 20:47:40 +0000 (00:47 +0400)
committermalc <av1474@comtv.ru>
Sun, 11 Dec 2011 20:47:40 +0000 (00:47 +0400)

Trivial merge