[commit: base] master: Merge branch 'master' into rule_fixes (80f7de6)

[Daniel Fischer]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/80f7de68d75de2d5ace40d954937097b037a390c

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

commit 80f7de68d75de2d5ace40d954937097b037a390c
Merge: 4036a1a... 3020c9c...
Author: Daniel Fischer <daniel.is.fischer at googlemail.com>
Date:   Sun Feb 17 17:24:20 2013 +0100

    Merge branch 'master' into rule_fixes

 Control/Applicative.hs          |   13 +-----
 Control/Concurrent.hs           |    3 -
 Control/Concurrent/Chan.hs      |    4 +-
 Control/Concurrent/MVar.hs      |    2 +-
 Control/Exception.hs            |    9 ----
 Control/Exception/Base.hs       |  101 +--------------------------------------
 Control/Monad/Instances.hs      |    4 +-
 Control/Monad/ST.hs             |    4 +-
 Control/Monad/ST/Lazy.hs        |    4 +-
 Data/Bits.hs                    |   23 +--------
 Data/Bool.hs                    |   11 ----
 Data/Char.hs                    |   17 +------
 Data/Dynamic.hs                 |    4 --
 Data/Fixed.hs                   |   26 ----------
 Data/Foldable.hs                |    6 --
 Data/IORef.hs                   |   17 -------
 Data/Int.hs                     |    7 ---
 Data/Ix.hs                      |    4 --
 Data/List.hs                    |    9 ----
 Data/Maybe.hs                   |   17 -------
 Data/OldTypeable.hs             |   15 +-----
 Data/OldTypeable/Internal.hs    |    8 +--
 Data/Ratio.hs                   |    5 --
 Data/String.hs                  |    2 -
 Data/Traversable.hs             |    2 -
 Data/Tuple.hs                   |   43 +----------------
 Data/Typeable/Internal.hs       |    6 +--
 Data/Version.hs                 |    4 +-
 Data/Word.hs                    |    6 --
 Debug/Trace.hs                  |    2 +-
 Foreign.hs                      |   17 -------
 Foreign/C/Error.hs              |   15 ------
 Foreign/C/Types.hs              |   57 ----------------------
 Foreign/ForeignPtr.hs           |   10 ----
 Foreign/ForeignPtr/Imp.hs       |   22 +--------
 Foreign/Marshal.hs              |   32 ------------
 Foreign/Marshal/Alloc.hs        |    3 -
 Foreign/Marshal/Error.hs        |    2 +-
 Foreign/Marshal/Pool.hs         |    4 --
 Foreign/Marshal/Utils.hs        |    4 --
 Foreign/Ptr.hs                  |   31 ++----------
 Foreign/StablePtr.hs            |   11 ----
 Foreign/Storable.hs             |    9 ----
 GHC/Conc.lhs                    |    3 -
 GHC/Conc/Sync.lhs               |   20 +-------
 GHC/Exts.hs                     |   43 +++++++++++++++-
 GHC/Generics.hs                 |    7 ++-
 GHC/IO.hs                       |    6 +-
 GHC/IO/Device.hs                |    6 --
 GHC/List.lhs                    |   23 +++++++--
 GHC/TopHandler.lhs              |    8 ++--
 Makefile.nhc98                  |   86 ---------------------------------
 NHC/PosixTypes.hsc              |   90 ----------------------------------
 NHC/SizedTypes.hs               |   52 --------------------
 Prelude.hs                      |    7 ---
 System/CPUTime.hsc              |    6 --
 System/Environment.hs           |   10 ----
 System/Exit.hs                  |    9 ----
 System/IO.hs                    |   77 ++----------------------------
 System/IO/Error.hs              |  100 +--------------------------------------
 System/IO/Unsafe.hs             |    5 --
 System/Info.hs                  |    7 +--
 System/Mem.hs                   |    4 --
 System/Posix/Internals.hs       |   23 +--------
 System/Posix/Types.hs           |   26 ----------
 Text/ParserCombinators/ReadP.hs |   27 ----------
 Text/Printf.hs                  |    2 -
 Text/Show/Functions.hs          |   10 ----
 Unsafe/Coerce.hs                |    4 --
 configure.ac                    |   10 +++-
 include/HsBase.h                |    4 --
 tests/IO/all.T                  |   16 ++++---
 tests/Memo1.lhs                 |    1 -
 tests/Memo2.lhs                 |    1 -
 tests/all.T                     |    6 +--
 75 files changed, 128 insertions(+), 1166 deletions(-)