From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Wed, 4 May 2011 19:09:29 +0000 (+0200)
Subject: Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=76dbb230df689648fb4c5de754441b86b9f9aefc;p=ghc-base.git

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

76dbb230df689648fb4c5de754441b86b9f9aefc