From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Wed, 27 Apr 2011 11:21:02 +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=b76137d58fb23d3d81f60ee25f9d83d8926a4037;p=ghc-base.git

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

b76137d58fb23d3d81f60ee25f9d83d8926a4037