Merge "These changes are the raw update to qemu-2.6."