2006-06-14 [colin] 2.3.0cvs12