Merge branch 'master' of git://git.et.redhat.com/libguestfs