2007-11-20 [colin] 3.1.0cvs11