Commit a3adc62bc88d1ed7dcb89b111d009577b0fb721c

henry 2002-06-21T08:29:11

Merged 1.32 into 1.4