Merge branch 'master' of git+ssh://192.168.2.134/home/rjones/d/libguestfs