alek e02d53f3d7 Mark conflict		2006-01-28 09:51:45 +00:00
..
pkg	Mark conflict	2006-01-28 09:51:45 +00:00
distinfo	update to version 1.3.2;	2005-12-20 08:34:07 +00:00
Makefile	Mark conflict	2006-01-28 09:51:45 +00:00