commit 11136a5cc752106cd60b88c34d17e3e83d3f1ed4 Merge: 79ff415 875182c Author: Matthew D Truch <matt at truch.net> Date: Tue Aug 31 15:20:06 2010 -0400 Merge branch 'master' of ssh://pkgs.fedoraproject.org/cfitsio ---