Merge branch 'master' of http://darcs.haskell.org/ghc
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 9 Jun 2011 10:01:11 +0000 (11:01 +0100)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Thu, 9 Jun 2011 10:01:11 +0000 (11:01 +0100)
commit75f9f3559b9959f067c893ae3f7c89da7fd18813
tree2ca1c4046ea5347ea1a76c1cccbc6c1dc607cbd9
parentf644a1caeb3bf1f65752102ee74daecacbded199
parent5c0a4132eb1fe60daa69a1d23c1de0715c8fdab0
Merge branch 'master' of darcs.haskell.org/ghc