Merge tag 'pull-testing-next-140622-1' of https://github.com/stsquad/qemu into staging