Merge branch 'master' of http://darcs.haskell.org/packages/base
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 17 Feb 2012 14:03:00 +0000 (14:03 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 17 Feb 2012 14:03:00 +0000 (14:03 +0000)
commitc5f337a73484fb7ba14e4ed62c2c0c16625fcfd0
tree381c72e01201a077ef443df215ac2ba912720714
parent491c3593fdbd44e54ce817bcd0ac2de3b1139ab9
parent0d8a4ae5bd7188cf255e769edac612e91b604d87
Merge branch 'master' of darcs.haskell.org/packages/base