2006-03-06 [colin] 2.0.0cvs115