espie 05c2845116 conflict		2004-12-30 00:16:05 +00:00
..
pkg	conflict	2004-12-30 00:16:05 +00:00
distinfo	upgrade to 1.1.1	2004-12-02 21:55:07 +00:00
Makefile	conflict	2004-12-30 00:16:05 +00:00