K 10
svn:author
V 6
stefan
K 8
svn:date
V 27
2013-05-05T16:36:32.981156Z
K 7
svn:log
V 158
- Use CONFLICTS instead of BROKEN. [1]
- While here, convert to new style Makefile header.

PR:		176666 [1]
Submitted by:	sbruno [1]
Suggested by:	eadler [1]

END