2006-08-05 [colin] 2.4.0cvs29