K 10 svn:author V 6 marcus K 8 svn:date V 27 2002-11-11T19:41:27.000000Z K 7 svn:log V 52 Fix up some conflicts when moving from my CVS repo. END