[hwloc/f15: 29/29] fix merge

[Peter Robinson]

commit ea6abcac666765e4f65bb5b55a92cb245ce95751
Merge: 3a769fe 39da1eb
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Tue Nov 15 00:24:28 2011 +0000

    fix merge

 hwloc.spec |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)
---