From: Jose Pedro Magalhaes <jpm@cs.uu.nl>
Date: Mon, 2 May 2011 18:48:10 +0000 (+0200)
Subject: Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=646d997dc6eca8d8395071429a526462fa14287a;hp=646d997dc6eca8d8395071429a526462fa14287a;p=ghc-hetmet.git

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