Howard Chu - 2001-09-24

Unified diff from 1.4 base