2004-11-06 [colin] 0.9.12cvs140