K 10 svn:author V 4 kris K 8 svn:date V 27 2006-10-12T03:35:56.000000Z K 7 svn:log V 119 Revert previous commit; it still conflicts but CONFLICTS checking was broken at the time. Approved by: portmgr (self) END