Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 19 Jun 2006 13:21:08 +0000 (09:21 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 19 Jun 2006 13:21:08 +0000 (09:21 -0400)

Trivial merge