build fix
Merge branch 'bullet-febret' of https://github.com/febret/omegalib into bullet-febret

Conflicts:
	external/UseOsgBullet.cmake