2004-09-07 [colin] 0.9.12cvs97