Merge
authorrjones@stein.redhat.com <rjones@stein.redhat.com>
Tue, 9 Sep 2008 09:13:03 +0000 (05:13 -0400)
committerrjones@stein.redhat.com <rjones@stein.redhat.com>
Tue, 9 Sep 2008 09:13:03 +0000 (05:13 -0400)

Trivial merge