commit 2460eea2020e9db7f463d8bdef6f55ef597743ed Merge: 8051a79 613ac75 Author: Steve Traylen <steve.traylen at cern.ch> Date: Mon Aug 15 11:49:51 2011 +0200 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/h5py into el6 Conflicts: h5py.spec ---