commit b2d33f8a3296bdff4f8af4dc2beb0c0cd2d45afc Merge: 6f00649 12c6fed Author: Jirka Hladky <hladky.jiri at gmail.com> Date: Sat Jan 1 23:50:16 2011 +0100 Merge branch 'master' of ssh://pkgs.fedoraproject.org/hwloc ---