Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 24 Nov 2011 12:32:03 +0000 (12:32 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 24 Nov 2011 12:32:03 +0000 (12:32 +0000)
commitcfcf0a549da1f3d7d74fe4695c56e3763bf44599
tree3bbcdf1c1ed9bc62453ce939f9024051d7375eeb
parent70bccc12ea81f218984eec5077e7e6f18584d737
parent9f24caabdab0cdf8aa211abdccfd850cce616c37
Merge branch 'master' of darcs.haskell.org/ghc

Conflicts:
compiler/ghci/ByteCodeItbls.lhs
compiler/ghci/ByteCodeItbls.lhs