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

Trivial merge