Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
authorRichard Jones <rjones@redhat.com>
Sat, 18 Apr 2009 09:16:34 +0000 (10:16 +0100)
committerRichard Jones <rjones@redhat.com>
Sat, 18 Apr 2009 09:16:34 +0000 (10:16 +0100)

Trivial merge