diff to 27/10/2006 trunk (revision 124)