From: Simon Marlow Date: Mon, 6 Jun 2011 10:39:00 +0000 (+0100) Subject: Merge remote branch 'working/master' X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d19c829904aec3be6bc807640573fdf5dcf05928;p=ghc-hetmet.git Merge remote branch 'working/master' --- d19c829904aec3be6bc807640573fdf5dcf05928