Merge commit.
authorRichard W.M. Jones <rjones@redhat.com>
Sat, 14 Feb 2009 13:05:50 +0000 (13:05 +0000)
committerRichard W.M. Jones <rjones@redhat.com>
Sat, 14 Feb 2009 13:05:50 +0000 (13:05 +0000)

Trivial merge