Merge branch 'qemu-vendor-drops' (qemu as of 2007-10-01)