Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <ian@well-typed.com>
Fri, 25 Jan 2013 22:50:06 +0000 (22:50 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 25 Jan 2013 22:50:06 +0000 (22:50 +0000)

Trivial merge