patch applied (cabal-branches/cabal-1.4): Merge changes in the 1.4 branch