Merge branch 'master' of git+ssh://g-rjones@et.redhat.com/git/virt-hostinfo
authorRichard W.M. Jones <rjones@redhat.com>
Sun, 9 Aug 2009 21:31:35 +0000 (22:31 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Sun, 9 Aug 2009 21:31:35 +0000 (22:31 +0100)

Trivial merge