[commit: base] ghc-generics1: Merge remote-tracking branch 'origin/master' into ghc-generics1 (133751a)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : ghc-generics1

http://hackage.haskell.org/trac/ghc/changeset/133751a23ae4560044b6225b7c762f6c8fb9a28f

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

commit 133751a23ae4560044b6225b7c762f6c8fb9a28f
Merge: 16db00b... 06df263...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Jun 5 20:52:11 2012 +0100

    Merge remote-tracking branch 'origin/master' into ghc-generics1

 Control/Concurrent/MVar.hs |   19 +++++-
 Data/Bits.hs               |   32 ++++++++++
 Data/List.hs               |    3 +-
 Data/Typeable.hs           |    1 -
 Data/Typeable/Internal.hs  |    1 +
 Foreign/Ptr.hs             |    3 -
 GHC/Arr.lhs                |    6 ++
 GHC/Base.lhs               |   21 +-----
 GHC/Char.hs                |    2 +-
 GHC/Enum.lhs               |   58 +++++++++++------
 GHC/Event/IntMap.hs        |    4 +-
 GHC/Exts.hs                |    2 +-
 GHC/Int.hs                 |   10 ++--
 GHC/Num.lhs                |   30 +++++++--
 GHC/Read.lhs               |    3 +
 GHC/Real.lhs               |   67 ++++++++++++++++++++-
 GHC/Show.lhs               |   19 ++++--
 GHC/Unicode.hs             |   46 +-------------
 GHC/Word.hs                |  148 ++-----------------------------------------
 System/Posix/Internals.hs  |   24 ++++++-
 tests/IO/all.T             |    4 +-
 21 files changed, 243 insertions(+), 260 deletions(-)