Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Tue, 20 Jun 2006 15:19:40 +0000 (11:19 -0400)

Trivial merge