Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base
authorIan Lynagh <ian@well-typed.com>
Fri, 30 Nov 2012 14:05:10 +0000 (14:05 +0000)
committerIan Lynagh <ian@well-typed.com>
Fri, 30 Nov 2012 14:05:10 +0000 (14:05 +0000)

Trivial merge