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

[Max Bolingbroke]

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

On branch  : encoding

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

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

commit fccc75b22770237c3488e5cfdf4397daac85c5bc
Merge: 9073d0f... 55d724b...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Mon Apr 11 17:18:12 2011 +0100

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

 GHC/Event/Manager.hs |    5 +----
 aclocal.m4           |   18 ++++++++++--------
 base.cabal           |    4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)