2006-05-15 [colin] 2.2.0cvs18