Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 26 Mar 2012 08:12:57 +0000 (09:12 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 26 Mar 2012 08:12:57 +0000 (09:12 +0100)
commit6403540416c22421516c91b12df630d4dce17686
treea210f2e0570dc30b134a9adf3a1b58e854ca6c5c
parenta44c3d90249e381b57a5220f80ad4bee316ff48b
parentbcb599506764d551e0e6b9084e0e9580f3f00336
Merge branch 'master' of darcs.haskell.org//ghc

Conflicts:
compiler/hsSyn/Convert.lhs
compiler/hsSyn/HsDecls.lhs
compiler/hsSyn/Convert.lhs
compiler/hsSyn/HsDecls.lhs
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/rename/RnNames.lhs
compiler/rename/RnTypes.lhs