[commit: base] master: Merge branch 'master' of mac:ghc/git/val32/libraries/base (dc05073)

[Ian Lynagh]

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

On branch  : master

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

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

commit dc05073dd8b050a36c6d68a8ff6611d9152baaa9
Merge: 2ed2201... 56254d7...
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri Oct 14 03:12:08 2011 +0100

    Merge branch 'master' of mac:ghc/git/val32/libraries/base

 GHC/IO/Encoding/Failure.hs |  137 ++++++++++++++++++++++++++++----------------
 GHC/IO/Handle/Text.hs      |   30 ++++++++--
 2 files changed, 111 insertions(+), 56 deletions(-)