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

[José Pedro Magalhães]

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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/479397bff23bc7516d6e8b9d553de96537405ec1

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

commit 479397bff23bc7516d6e8b9d553de96537405ec1
Merge: 6c37984... acfd22e...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Fri May 20 20:15:48 2011 +0200

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

 GHC/Foreign.hs             |    9 +++--
 GHC/IO/Encoding.hs         |    6 ++--
 GHC/IO/Encoding/Failure.hs |   70 +++++++++++++++++++++++++++++++++++--------
 GHC/IO/Encoding/Types.hs   |   11 +++++++
 GHC/IO/Handle/Text.hs      |    9 +++--
 5 files changed, 81 insertions(+), 24 deletions(-)