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

[Max Bolingbroke]

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

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/3033499c4898ed608cd1ce0bb3c3912d5ce8b8a4

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

commit 3033499c4898ed608cd1ce0bb3c3912d5ce8b8a4
Merge: ad261e2... b751723...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Fri May 13 15:46:34 2011 +0100

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

 GHC/Base.lhs |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)