Merge branch 'master' of git+ssh://192.168.2.134/home/rjones/d/libguestfs
authorRichard Jones <rjones@centos5x32.home.annexia.org>
Wed, 10 Jun 2009 13:32:59 +0000 (14:32 +0100)
committerRichard Jones <rjones@centos5x32.home.annexia.org>
Wed, 10 Jun 2009 13:32:59 +0000 (14:32 +0100)

Trivial merge