2006-05-21 [colin] 2.2.0cvs42