2006-11-13 [colin] 2.6.0cvs42