From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Thu, 12 May 2011 11:20:48 +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=decc2725e1a5308cb53b5c29cf5917906da77b19;hp=--cc;p=ghc-base.git

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

decc2725e1a5308cb53b5c29cf5917906da77b19