Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Mar 2012 17:19:22 +0000 (17:19 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Mar 2012 17:19:22 +0000 (17:19 +0000)
commit69b2113c1dbc5e583718e64e6ff2145daf721b31
treece420dffa029f2c24544a7fe5d1e1e7b9d87b5f6
parentb74748ff7b3f577056a8b789e8bf8805611ce292
parent4a3b8c3f6d9e86ff0df2595484f71bc85d4fca37
Merge branch 'master' of darcs.haskell.org/ghc