Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Fri, 12 May 2006 14:48:52 +0000 (10:48 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Fri, 12 May 2006 14:48:52 +0000 (10:48 -0400)

Trivial merge