[commit: base] master: Merge branch 'master' of http://darcs.haskell.org//packages/base (b500ee8)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b500ee8ded3f449d4643c587bc276d3224334fd1

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

commit b500ee8ded3f449d4643c587bc276d3224334fd1
Merge: e7df49e... 7896087...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Oct 31 09:20:45 2012 +0000

    Merge branch 'master' of http://darcs.haskell.org//packages/base

 Control/Concurrent.hs              |    8 +-
 Control/Concurrent/Chan.hs         |   16 ++--
 Control/Concurrent/MVar.hs         |    2 +-
 Control/Monad.hs                   |   66 ++++++------
 Control/Monad/Fix.hs               |    6 +-
 Control/Monad/ST.hs                |    6 +-
 Control/Monad/ST/Imp.hs            |   12 +-
 Control/Monad/ST/Safe.hs           |    8 +-
 Data/Bits.hs                       |   32 +++---
 Data/Bool.hs                       |    8 +-
 Data/Char.hs                       |   16 ++--
 Data/Complex.hs                    |   25 ++---
 Data/Data.hs                       |   76 +++++++-------
 Data/Dynamic.hs                    |    6 +-
 Data/Either.hs                     |    8 +-
 Data/Foldable.hs                   |    4 +-
 Data/IORef.hs                      |   16 ++--
 Data/Ix.hs                         |    8 +-
 Data/List.hs                       |  202 ++++++++++++++++++------------------
 Data/Maybe.hs                      |   25 ++---
 Data/Ratio.hs                      |   19 +---
 Data/STRef.hs                      |   12 +-
 Data/STRef/Lazy.hs                 |   10 +-
 Data/Traversable.hs                |   74 +++++++++++++-
 Data/Tuple.hs                      |   10 +-
 Data/Typeable.hs                   |   64 ++++++------
 Data/Unique.hs                     |    6 +-
 Debug/Trace.hs                     |    4 +-
 Foreign/C/Error.hs                 |   39 +++-----
 Foreign/C/String.hs                |   58 +++++-----
 Foreign/Marshal/Alloc.hs           |   18 ++--
 Foreign/Marshal/Array.hs           |   40 ++++----
 Foreign/Marshal/Error.hs           |   14 +--
 Foreign/Marshal/Pool.hs            |   28 +++---
 Foreign/Marshal/Utils.hs           |   23 ++---
 Foreign/Ptr.hs                     |   24 ++--
 Foreign/StablePtr.hs               |   10 +-
 Foreign/Storable.hs                |   16 ++--
 GHC/Conc.lhs                       |   84 ++++++++--------
 GHC/Conc/IO.hs                     |   20 ++--
 GHC/Conc/Sync.lhs                  |   64 ++++++------
 GHC/Conc/Windows.hs                |   10 +-
 GHC/Err.lhs                        |   12 +-
 GHC/Foreign.hs                     |   14 ++--
 GHC/List.lhs                       |    4 +-
 GHC/MVar.hs                        |   16 ++--
 GHC/Pack.lhs                       |    6 +-
 GHC/Read.lhs                       |   32 ++----
 GHC/Stable.lhs                     |   10 +-
 Numeric.hs                         |   37 +++----
 System/Environment.hs              |   10 +-
 System/Exit.hs                     |    6 +-
 System/IO.hs                       |  108 ++++++++++----------
 System/IO/Error.hs                 |   46 ++++-----
 System/IO/Unsafe.hs                |    6 +-
 System/Info.hs                     |    8 +-
 System/Mem.hs                      |    2 +-
 System/Mem/Weak.hs                 |   14 ++--
 Text/ParserCombinators/ReadP.hs    |   72 +++++++-------
 Text/ParserCombinators/ReadPrec.hs |   34 +++---
 Text/Read.hs                       |   24 ++--
 Text/Read/Lex.hs                   |   16 ++--
 Text/Show.hs                       |   18 ++--
 63 files changed, 850 insertions(+), 842 deletions(-)