2005-07-05 [colin] 1.9.12cvs22