Merge branch 'qom-cpu' of git://repo.or.cz/qemu/afaerber