Commit 61e54cd2d23910aff5bdf522d9613c818428f2cc

henry 2002-06-12T08:18:57

Reformatted and merged with 1.32