[commit: ghc] wip/new-flatten-skolems-Aug14: Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14 (7d57cec)

[git at git.haskell.org]

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

On branch  : wip/new-flatten-skolems-Aug14
Link       : http://ghc.haskell.org/trac/ghc/changeset/7d57cec81800f53e6ebb42e84bd1625327902658/ghc

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

commit 7d57cec81800f53e6ebb42e84bd1625327902658
Merge: 3c17388 64d0a19
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Oct 29 15:07:55 2014 +0000

    Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14



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

7d57cec81800f53e6ebb42e84bd1625327902658
 libraries/base/Data/Bool.hs    |  2 +-
 libraries/base/Data/Functor.hs |  6 +++---
 libraries/base/GHC/List.lhs    | 34 ++++++++++++++++++++--------------
 libraries/base/Text/Printf.hs  |  2 +-
 utils/haddock                  |  2 +-
 5 files changed, 26 insertions(+), 20 deletions(-)