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

[José Pedro Magalhães]

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

On branch  : ghc-generics

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

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

commit decc2725e1a5308cb53b5c29cf5917906da77b19
Merge: 792a8b8... b751723...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Thu May 12 13:20:48 2011 +0200

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

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