tree c18a9cc2a9f213c8a37473f9b7aa001a99898547
parent dd7b25b5b47df8aaf5580faaf3f60b2a1b779c37
parent e1c2008af64487e7d3cec615612b7f467ebe9bc8
author malc <av1474@comtv.ru> 1320185794 +0400
committer malc <av1474@comtv.ru> 1320185794 +0400

Merge branch 'master' of git://git.qemu.org/qemu