Merge
authorRichard W.M. Jones <rjones@redhat.com>
Sat, 9 Aug 2008 09:24:23 +0000 (10:24 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Sat, 9 Aug 2008 09:24:23 +0000 (10:24 +0100)

Trivial merge