2009-09-11more fixes for collisions
insilmaril [Fri, 11 Sep 2009 12:56:15 +0000] rev 794
more fixes for collisions