[commit: base] encoding: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base into encoding (512ec1b)

[Ian Lynagh]

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

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/512ec1b5d5da9f153b2c805dd3a44aa82478da38

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

commit 512ec1b5d5da9f153b2c805dd3a44aa82478da38
Merge: 6be668d... 47ac5d8...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Wed Apr 6 15:31:18 2011 +0100

    Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base into encoding

 GHC/IO/Encoding/Types.hs |    8 ++++++--
 include/HsBase.h         |    7 +++++++
 2 files changed, 13 insertions(+), 2 deletions(-)