Pulled from branch_1_1
authoraland <aland>
Fri, 18 Aug 2006 16:23:22 +0000 (16:23 +0000)
committeraland <aland>
Fri, 18 Aug 2006 16:23:22 +0000 (16:23 +0000)

Trivial merge