Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 12 May 2011 11:20:48 +0000 (13:20 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 12 May 2011 11:20:48 +0000 (13:20 +0200)
commitdecc2725e1a5308cb53b5c29cf5917906da77b19
tree94a8250db349ad62cc9f5fe1f4ceb957fcd883c2
parent792a8b86185d4cc74bb3d0d31b481ff0de4cf0d6
parentb751723d882e51241f04d6d2ec46fce70f0e0817
Merge branch 'master' of darcs.haskell.org/packages/base into ghc-generics
GHC/Base.lhs