Merge branch 'master' of git+ssh://192.168.122.1/home/rjones/d/libguestfs
authorRichard Jones <rjones@centos5x32.home.annexia.org>
Thu, 2 Jul 2009 23:22:14 +0000 (00:22 +0100)
committerRichard Jones <rjones@centos5x32.home.annexia.org>
Thu, 2 Jul 2009 23:22:14 +0000 (00:22 +0100)

Trivial merge