Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 10 May 2011 06:12:21 +0000 (08:12 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 10 May 2011 06:12:21 +0000 (08:12 +0200)
commit9e4c8ad32eff3bf0350480109b2f5a5ad4738f09
treef7a025f43701f115d2390b9e5f2a7acd898c45da
parent61d89bc49eb75d74ed9196ba5f7b7b32018b914b
parent2d5205118357cac8a2dd43b33bcd93a3c00f5558
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics