simon 1031e81160 update to current maintenance versions, adjust conflict-markers. ... ok martynas@		2007-03-17 16:54:26 +00:00
..
DESCR
PLIST	update to current maintenance versions, adjust conflict-markers.	2007-03-17 16:54:26 +00:00