Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 19:09:29 +0000 (21:09 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 19:09:29 +0000 (21:09 +0200)

Trivial merge