Merge pull request #1 from qemu/master

pull the latest qemu master tree