Merge branch 'cocoa-for-upstream' of git://repo.or.cz/qemu/afaerber