Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base
authorMax Bolingbroke <batterseapower@hotmail.com>
Sun, 3 Apr 2011 20:51:23 +0000 (21:51 +0100)
committerMax Bolingbroke <batterseapower@hotmail.com>
Sun, 3 Apr 2011 20:51:23 +0000 (21:51 +0100)

Trivial merge