Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
authorRichard W.M. Jones <rjones@redhat.com>
Thu, 23 Apr 2009 09:32:31 +0000 (10:32 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Thu, 23 Apr 2009 09:32:31 +0000 (10:32 +0100)

Trivial merge