Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 11:11:16 +0000 (13:11 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 11:11:16 +0000 (13:11 +0200)
commit91a75b9af1015b053e6904f4ff7bf36c5b1e0ad1
tree305ced403a68d8d1814deb0f752654e77f03f91d
parentada48bbc7f6a43b2c042df629327902d82cea681
parentac51be0997c4d0cf65cb3635b936ddf011e372bd
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics