Merge pull request #61 from bphinz/buildfixes

Buildfixes for el5 & el6