Reduce the difference between trunk and libpci-...
Reduce the difference between trunk and libpci-...

Reduce the difference between trunk and libpci-branch by merging trivial stuff
so that maintaining the branch is much easier.
lstopo-draw.c is the only remaining file that's very different in the branch now.

This commit was SVN r1832.

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