Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/libguestfs
authorRichard W.M. Jones <rjones@redhat.com>
Sun, 28 Jun 2009 11:28:30 +0000 (13:28 +0200)
committerRichard W.M. Jones <rjones@redhat.com>
Sun, 28 Jun 2009 11:28:30 +0000 (13:28 +0200)

Trivial merge