Merge.
authorRichard W.M. Jones <rjones@redhat.com>
Fri, 3 Jul 2009 19:00:50 +0000 (20:00 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Fri, 3 Jul 2009 19:00:50 +0000 (20:00 +0100)

Trivial merge