Author: snc at macports.org (original author: snc at macports.org) Revision: 58433 Property Name: svn:log @@ -1 +1 @@ -whitespace +whitespace, fix conflicts