Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base
authorIavor S. Diatchki <diatchki@Perun.(none)>
Thu, 30 May 2013 14:48:41 +0000 (07:48 -0700)
committerIavor S. Diatchki <diatchki@Perun.(none)>
Thu, 30 May 2013 14:48:41 +0000 (07:48 -0700)

Trivial merge