Fixes for Mac 10.6 and using wrong object.h header
Merge remote-tracking branch 'devel/visit_mac_build_fixes' into devel-master

* devel/visit_mac_build_fixes:
  Fixes for Mac 10.6 and using wrong object.h header

Conflicts:
	CMake/cdat_modules/visit_external.cmake