Back out r4099: I was not careful and committed...
Back out r4099: I was not careful and committed...

Back out r4099: I was not careful and committed some
not-ready-for-prime-time stuff.  :-(

This commit was SVN r4105.

The following SVN revision numbers were found above:
  r4099 --> 408a50b8d79a59afa6644f739e1203df3227e864

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