[commit: ghc] wip/nested-cpr: Merge remote-tracking branch 'origin/wip/T8598' into wip/nested-cpr (4f216b0)

[git at git.haskell.org]

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

On branch  : wip/nested-cpr
Link       : http://ghc.haskell.org/trac/ghc/changeset/4f216b058cadffee5d314fe61114450463772592/ghc

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

commit 4f216b058cadffee5d314fe61114450463772592
Merge: 81b3b12 3cdf125
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Mon Dec 9 16:14:41 2013 +0000

    Merge remote-tracking branch 'origin/wip/T8598' into wip/nested-cpr
    
    Conflicts:
    	compiler/basicTypes/Demand.lhs
    	compiler/basicTypes/MkId.lhs
    	compiler/stranal/WorkWrap.lhs



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


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 4f216b058cadffee5d314fe61114450463772592