K 10
svn:author
V 3
mat
K 8
svn:date
V 27
2014-03-03T18:47:37.136145Z
K 7
svn:log
V 123
Add CONFLICT{,_BUILD,_INSTALL} to the options helpers.

PR:		187226 (based on)
Submitted by:	adamw
Sponsored by:	Absolight

END