2006-06-20 [colin] 2.3.0cvs25