Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <igloo@earth.li>
Thu, 19 Jul 2012 19:38:46 +0000 (20:38 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 19 Jul 2012 19:38:46 +0000 (20:38 +0100)

Trivial merge