2005-05-20 [colin] 1.9.11cvs2