Merge
authorrjones@stein.redhat.com <rjones@stein.redhat.com>
Mon, 8 Sep 2008 17:54:26 +0000 (13:54 -0400)
committerrjones@stein.redhat.com <rjones@stein.redhat.com>
Mon, 8 Sep 2008 17:54:26 +0000 (13:54 -0400)

Trivial merge