Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 22 Oct 2012 08:11:17 +0000 (09:11 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 22 Oct 2012 08:11:17 +0000 (09:11 +0100)
commitb243d30b9cf5c78624f743f69e072a5dd46d9065
treed971c290e1429667f50bd3c4843e799259a45985
parentcd51b9ca85c095ea894568b1ca1eb0c8ad4b6f56
parent4f83f54144d95448bd68e01975f2edf9081bbdb7
Merge branch 'master' of darcs.haskell.org/ghc
compiler/prelude/PrelRules.lhs
compiler/simplCore/OccurAnal.lhs