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)

Trivial merge