[commit: base] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics (6c37984)

[José Pedro Magalhães]

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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/6c3798426906a7801a3edae9e2e31cb147d7f73e

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

commit 6c3798426906a7801a3edae9e2e31cb147d7f73e
Merge: decc272... 509f28c...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Tue May 17 08:51:23 2011 +0200

    Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics

 Control/Exception/Base.hs      |    2 +-
 Foreign/C/String.hs            |   44 +++++++-
 GHC/Conc/Windows.hs            |   16 +--
 GHC/Environment.hs             |   36 +++++-
 GHC/Foreign.hs                 |  255 ++++++++++++++++++++++++++++++++++++++++
 GHC/IO.hs                      |   14 ++-
 GHC/IO/Encoding.hs             |   78 +++++++++----
 GHC/IO/Encoding.hs-boot        |    6 +
 GHC/IO/Encoding/CodePage.hs    |   96 ++++++++-------
 GHC/IO/Encoding/Failure.hs     |  129 ++++++++++++++++++++
 GHC/IO/Encoding/Iconv.hs       |  114 ++++++------------
 GHC/IO/Encoding/Latin1.hs      |   77 +++++++------
 GHC/IO/Encoding/Types.hs       |   37 ++++--
 GHC/IO/Encoding/UTF16.hs       |  149 ++++++++++++------------
 GHC/IO/Encoding/UTF32.hs       |  146 +++++++++++++----------
 GHC/IO/Encoding/UTF8.hs        |  101 +++++++++-------
 GHC/IO/FD.hs                   |   11 +--
 GHC/IO/Handle/Internals.hs     |   42 ++++++-
 GHC/Windows.hs                 |   44 +++++++
 System/Environment.hs          |  219 ++++++++++++++++++++++++++++-------
 System/IO.hs                   |    2 +-
 System/Posix/Internals.hs      |   32 +++++
 System/Posix/Internals.hs-boot |    7 +
 base.cabal                     |    3 +
 24 files changed, 1214 insertions(+), 446 deletions(-)