From: Simon Marlow <marlowsd@gmail.com>
Date: Tue, 5 Apr 2011 15:03:25 +0000 (+0100)
Subject: Merge branch 'master' of /home/simonmar/ghc-git
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=60ec8693a9c9cf34fda6a097286dab3fe6bddd70

Merge branch 'master' of /home/simonmar/ghc-git
---

60ec8693a9c9cf34fda6a097286dab3fe6bddd70