Merge branch 'ghc-generics'
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 26 May 2011 16:27:34 +0000 (18:27 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 26 May 2011 16:27:34 +0000 (18:27 +0200)

Trivial merge