Merge
authorPeter Jones <pjones@redhat.com>
Fri, 2 Nov 2007 13:25:33 +0000 (09:25 -0400)
committerPeter Jones <pjones@redhat.com>
Fri, 2 Nov 2007 13:25:33 +0000 (09:25 -0400)

Trivial merge