K 10 svn:author V 6 eadler K 8 svn:date V 27 2013-05-10T17:42:13.844710Z K 7 svn:log V 86 Permit relative paths with mergemaster -m Reviewed by: dim, brooks MFC after: 3 days END