Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 24 Mar 2012 22:25:56 +0000 (22:25 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 24 Mar 2012 22:25:56 +0000 (22:25 +0000)
commitd9ee9d9d964c5cc4bc40c2a62d825e4b33548860
treefd1e819c6ffad29ddfe9c8a6ea38d076ea1789a1
parentb857c8ad367877f424b5fca50bd45199f39f86c7
parent4f6a56ea2211761c13808c3248cbf84b47b61c17
Merge branch 'master' of darcs.haskell.org//ghc

Conflicts:
compiler/main/HscStats.lhs
compiler/deSugar/DsMeta.hs
compiler/hsSyn/HsUtils.lhs
compiler/rename/RnSource.lhs
compiler/rename/RnTypes.lhs