[commit: base] master: Merge remote branch 'origin/master' into ghc-generics (7e0984f)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7e0984fb4e3bf25e6050ab6fecc98211ad9f3ecd

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

commit 7e0984fb4e3bf25e6050ab6fecc98211ad9f3ecd
Merge: decc272... acfd22e...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu May 19 08:38:35 2011 +0100

    Merge remote branch 'origin/master' 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                 |  256 ++++++++++++++++++++++++++++++++++++++++
 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     |  173 +++++++++++++++++++++++++++
 GHC/IO/Encoding/Iconv.hs       |  114 ++++++------------
 GHC/IO/Encoding/Latin1.hs      |   77 +++++++------
 GHC/IO/Encoding/Types.hs       |   48 ++++++--
 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/IO/Handle/Text.hs          |    9 +-
 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 +
 25 files changed, 1275 insertions(+), 450 deletions(-)