From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Tue, 17 May 2011 06:51:23 +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=6c3798426906a7801a3edae9e2e31cb147d7f73e;p=ghc-base.git

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

6c3798426906a7801a3edae9e2e31cb147d7f73e