Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Thu, 25 May 2006 16:40:08 +0000 (12:40 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Thu, 25 May 2006 16:40:08 +0000 (12:40 -0400)

Trivial merge