Merge branch 'master' of git://git.qemu.org/qemu
commitdd7b25b5b47df8aaf5580faaf3f60b2a1b779c37
authormalc <av1474@comtv.ru>
Tue, 1 Nov 2011 22:14:19 +0000 (2 02:14 +0400)
committermalc <av1474@comtv.ru>
Tue, 1 Nov 2011 22:14:19 +0000 (2 02:14 +0400)
treed671ce116243083338b0be0849a58ef9a00b17ff
parent0756e71c3f4327f4d2ad3c6099cdafc23de14fcf
parent7f7623662781fa152c5aa39fd63a2e8766516a2c
Merge branch 'master' of git://git.qemu.org/qemu