Merge branch 'master' of git://git.et.redhat.com/libguestfs
authorRichard Jones <rjones@centos5x32.home.annexia.org>
Wed, 10 Jun 2009 13:23:15 +0000 (14:23 +0100)
committerRichard Jones <rjones@centos5x32.home.annexia.org>
Wed, 10 Jun 2009 13:23:15 +0000 (14:23 +0100)

Trivial merge