Merge branch 'master' of git+ssh://rich@hakodate/home/rich/d/libguestfs
authorRichard Jones <rjones@redhat.com>
Wed, 6 May 2009 16:55:46 +0000 (17:55 +0100)
committerRichard Jones <rjones@redhat.com>
Wed, 6 May 2009 16:55:46 +0000 (17:55 +0100)

Trivial merge