[commit: ghc] wip/rae-new-coercible: Merge commit 'bafba11' into wip/rae-new-coercible (85db007)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/rae-new-coercible
Link       : http://ghc.haskell.org/trac/ghc/changeset/85db007fed4b8a3396d4713ad08e75bc95e1405c/ghc

>---------------------------------------------------------------

commit 85db007fed4b8a3396d4713ad08e75bc95e1405c
Merge: 1b8a6d7 bafba11
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sun Dec 7 14:29:25 2014 -0500

    Merge commit 'bafba11' into wip/rae-new-coercible
    
    Conflicts:
    	compiler/basicTypes/DataCon.hs
    	compiler/utils/Util.hs



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 85db007fed4b8a3396d4713ad08e75bc95e1405c