Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Mon, 31 Jul 2006 12:59:59 +0000 (08:59 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Mon, 31 Jul 2006 12:59:59 +0000 (08:59 -0400)

Trivial merge