From: Ian Lynagh <igloo@earth.li>
Date: Mon, 4 Apr 2011 15:45:42 +0000 (+0100)
Subject: Merge branch 'master' of http://darcs.haskell.org/ghc
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=aaafc986f2175958bcadd4af6b3c9889bfc89009

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

aaafc986f2175958bcadd4af6b3c9889bfc89009