Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:26:18 +0000 (13:26 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 13:26:18 +0000 (13:26 +0000)
commit0ab8cc19bc73f19cc91daea2b649faa7960bcf73
treeec5495074a9c3869e364135869b06e9a754db06b
parente3426665b056ef9dcaa48722e2e33f260f055727
parenta47ee23a82a669808569b3865383bf932b67fa95
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/basicTypes/DataCon.lhs
compiler/basicTypes/DataCon.lhs
compiler/simplCore/Simplify.lhs
compiler/types/TyCon.lhs
compiler/types/Type.lhs