(have to fix the matching of wildcarded terminations as it doesn't work as it should) svn path=/trunk/; revision=21212
svn path=/trunk/; revision=21191