From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Fri, 20 May 2011 18:15:48 +0000 (+0200)
Subject: Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=479397bff23bc7516d6e8b9d553de96537405ec1

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

479397bff23bc7516d6e8b9d553de96537405ec1