Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Thu, 6 Jul 2006 12:57:15 +0000 (08:57 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Thu, 6 Jul 2006 12:57:15 +0000 (08:57 -0400)

Trivial merge