2005-03-30 [colin] 1.9.6cvs15