[hwloc/f15: 2/2] Merge branch 'master' into f15

[Dan Horák]

commit 626f800658f733b463ae6cd0288c7a27746573ae
Merge: ea6abca 47a0dd5
Author: Dan Horák <dan at danny.cz>
Date:   Sun Nov 27 16:20:23 2011 +0100

    Merge branch 'master' into f15

 hwloc.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---