espie feb1f13ea2 remove conflict		2004-12-20 14:47:42 +00:00
..
pkg	remove conflict	2004-12-20 14:47:42 +00:00
distinfo	md5->distinfo	2002-03-21 19:59:18 +00:00
Makefile	remove conflict	2004-12-20 14:47:42 +00:00