Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 27 Apr 2011 11:21:02 +0000 (13:21 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 27 Apr 2011 11:21:02 +0000 (13:21 +0200)
commitb76137d58fb23d3d81f60ee25f9d83d8926a4037
treef313b98451aa7688ec3f4b867e1b516bdb647428
parentdfbc01d590acb27e9b40df1693e888531376738e
parent68871b8dc3e82472e98cecdbf8e629091c83549e
Merge branch 'master' of darcs.haskell.org/packages/base into ghc-generics