Merge branch 'master' of http://darcs.haskell.org/nofib
authorDavid Terei <davidterei@gmail.com>
Wed, 8 Feb 2012 02:52:47 +0000 (18:52 -0800)
committerDavid Terei <davidterei@gmail.com>
Wed, 8 Feb 2012 02:52:47 +0000 (18:52 -0800)

Trivial merge