2005-11-07 [colin] 1.9.99cvs17