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

[José Pedro Magalhães]

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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/76dbb230df689648fb4c5de754441b86b9f9aefc

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

commit 76dbb230df689648fb4c5de754441b86b9f9aefc
Merge: 9d3a29e... dc3ea0d...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Wed May 4 21:09:29 2011 +0200

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

 Control/Monad/Group.hs |   33 +++++++++++++++++++++++++++++++++
 Control/Monad/Zip.hs   |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 base.cabal             |    2 ++
 3 files changed, 81 insertions(+), 0 deletions(-)