Merge.
authorRichard W.M. Jones <rjones@redhat.com>
Fri, 9 Jan 2009 14:15:11 +0000 (14:15 +0000)
committerRichard W.M. Jones <rjones@redhat.com>
Fri, 9 Jan 2009 14:15:11 +0000 (14:15 +0000)

Trivial merge