alek 6f3424413a Mark conflict		2006-01-27 20:57:02 +00:00
..
patches
pkg	Mark conflict	2006-01-27 20:57:02 +00:00
distinfo
Makefile	Mark conflict	2006-01-27 20:57:02 +00:00