pooka 90651bdae0 there is no conflict, you are receding		2003-05-25 21:46:09 +00:00
..
magdir	there is no conflict, you are receding	2003-05-25 21:46:09 +00:00
Header
Localstuff
magic2mime
magic.mime	file 4.03	2003-05-25 21:26:39 +00:00
Makefile.am	file 4.03	2003-05-25 21:26:39 +00:00
Makefile.in	there is no conflict, you are receding	2003-05-25 21:46:09 +00:00