Merge branch 'qemu-cvs'