Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 28 Apr 2011 08:30:55 +0000 (10:30 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 28 Apr 2011 08:30:55 +0000 (10:30 +0200)

Trivial merge