2005-10-04 [colin] 1.9.15cvs6