Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 Apr 2012 10:43:19 +0000 (11:43 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 Apr 2012 10:43:19 +0000 (11:43 +0100)
commitb40f001f84aac224be0b18064dd1e2149b13f5f4
tree5cf0258b698dbfa21522846fe0754206230f256c
parent6100eb449c613e003e6114e03f1408f0366a8dba
parent012596565fe588037fda352b6e9fc6dd29c723ff
Merge branch 'master' of darcs.haskell.org/ghc