OSF fixes
OSF fixes

This commit was SVN r842.

shekkbuilder/hwloc,shekkbuilder/hwloc,shekkbuilder/hwloc,ggouaillardet/hwloc,ggouaillardet/hwloc,ggouaillardet/hwloc,shekkbuilder/hwloc,ggouaillardet/hwloc