Merge
authorRichard W.M. Jones <rjones@redhat.com>
Thu, 11 Sep 2008 16:27:49 +0000 (17:27 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Thu, 11 Sep 2008 16:27:49 +0000 (17:27 +0100)

Trivial merge