Merge branch 'master' of http://darcs.haskell.org/packages/base
authorIan Lynagh <igloo@earth.li>
Sun, 18 Dec 2011 14:15:42 +0000 (14:15 +0000)
committerIan Lynagh <igloo@earth.li>
Sun, 18 Dec 2011 14:15:42 +0000 (14:15 +0000)

Trivial merge