Merge branch 'master'
authorDavid Teigland <teigland@redhat.com>
Thu, 27 Apr 2006 15:49:55 +0000 (11:49 -0400)
committerSteven Whitehouse <swhiteho@redhat.com>
Thu, 27 Apr 2006 15:49:55 +0000 (11:49 -0400)

Trivial merge