Merge.
authorRichard W.M. Jones <rjones@redhat.com>
Wed, 28 Jan 2009 11:51:29 +0000 (11:51 +0000)
committerRichard W.M. Jones <rjones@redhat.com>
Wed, 28 Jan 2009 11:51:29 +0000 (11:51 +0000)

Trivial merge