Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
authorRichard Jones <rjones@redhat.com>
Tue, 28 Apr 2009 21:44:59 +0000 (22:44 +0100)
committerRichard Jones <rjones@redhat.com>
Tue, 28 Apr 2009 21:44:59 +0000 (22:44 +0100)

Trivial merge