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