Merge branch 'trivial-patches' of git://github.com/stefanha/qemu