4b1c7f1857
update Makefile infrastructure for 0.3f bump shared library versions fix some merge problems
update Makefile infrastructure for 0.3f bump shared library versions fix some merge problems