conflict fix in Makefile
conflict fix in Makefile

Ignore-this: 71e97e9e3fa0e89b53aa26f58fc7f697

darcs-hash:20100814083138-8ea92-6a395d5bf2d9063c24ceba47437e374665c1473a

mfp/ocsigenserver,mfp/ocsigenserver