Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base
authorIavor S. Diatchki <diatchki@Perun.(none)>
Mon, 27 May 2013 21:45:17 +0000 (14:45 -0700)
committerIavor S. Diatchki <diatchki@Perun.(none)>
Mon, 27 May 2013 21:45:17 +0000 (14:45 -0700)

Trivial merge