Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Apr 2012 16:06:40 +0000 (17:06 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Apr 2012 16:06:40 +0000 (17:06 +0100)
commitcc5d9dca79b588985c059a85624b4ad4c4406c3b
tree4fb5c406bf4ee8d3bde06c013bc3230e51035dea
parentfa9fdc283be5429ec65c625d35daf2d7e65e2227
parent8152611272c60e814434ed3169bf9a90bd58cbb0
Merge branch 'master' of darcs.haskell.org//ghc