Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <ian@well-typed.com>
Mon, 15 Oct 2012 20:52:59 +0000 (21:52 +0100)
committerIan Lynagh <ian@well-typed.com>
Mon, 15 Oct 2012 20:52:59 +0000 (21:52 +0100)

Trivial merge