pull fixes from branch_1_1
authoraland <aland>
Sun, 26 Nov 2006 19:48:57 +0000 (19:48 +0000)
committeraland <aland>
Sun, 26 Nov 2006 19:48:57 +0000 (19:48 +0000)

Trivial merge