K 10
svn:author
V 7
delphij
K 8
svn:date
V 27
2011-05-18T23:41:41.000000Z
K 7
svn:log
V 115
Resolve conflict against b.p.m's CONF_* variables.

Submitted by:	Chris Rees <utisoft gmail.com>
PR:		ports/157157

END