[cvs-nhc98] patch applied (hat): Update to deal with package name differences in ghc-5.04.