Merge branch 'master'
authorSteven Whitehouse <swhiteho@redhat.com>
Fri, 31 Mar 2006 20:34:58 +0000 (15:34 -0500)
committerSteven Whitehouse <swhiteho@redhat.com>
Fri, 31 Mar 2006 20:34:58 +0000 (15:34 -0500)

Trivial merge