2006-06-25 [ticho] 2.3.1cvs20