Merge pull request #1 from qemu/master

merge the latest master tree