2006-11-12 [colin] 2.6.0cvs38