K 10
svn:author
V 5
gabor
K 8
svn:date
V 27
2009-06-27T08:23:05.000000Z
K 7
svn:log
V 101
- Update CONFLICTS

PR:		ports/135570
Submitted by:	Alexander Best <alexbestms@math.uni-muenster.de>

END