Merge heads
authorRichard W.M. Jones <rjones@redhat.com>
Wed, 10 Sep 2008 17:13:14 +0000 (18:13 +0100)
committerRichard W.M. Jones <rjones@redhat.com>
Wed, 10 Sep 2008 17:13:14 +0000 (18:13 +0100)

Trivial merge