Merge branch 'master' of git+ssh://192.168.122.141/home/rjones/d/libguestfs
authorRichard Jones <rjones@redhat.com>
Fri, 8 May 2009 07:40:49 +0000 (08:40 +0100)
committerRichard Jones <rjones@redhat.com>
Fri, 8 May 2009 07:40:49 +0000 (08:40 +0100)

Trivial merge