Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
authorRichard W.M. Jones <rjones@redhat.com>
Wed, 24 Jun 2009 10:55:57 +0000 (11:55 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Wed, 24 Jun 2009 10:55:57 +0000 (11:55 +0100)

Trivial merge