Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
authorRichard Jones <rjones@trick.home.annexia.org>
Fri, 17 Jul 2009 15:33:30 +0000 (16:33 +0100)
committerRichard Jones <rjones@trick.home.annexia.org>
Fri, 17 Jul 2009 15:33:30 +0000 (16:33 +0100)

Trivial merge