2006-11-10 [colin] 2.6.0cvs25