Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 27 Feb 2006 18:27:34 +0000 (13:27 -0500)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 27 Feb 2006 18:27:34 +0000 (13:27 -0500)

Trivial merge