2005-07-06 [colin] 1.9.12cvs24