Merge pull request #311 from nico/cleanups
authorEvan Martin <martine@danga.com>
Mon, 4 Jun 2012 17:16:39 +0000 (10:16 -0700)
committerEvan Martin <martine@danga.com>
Mon, 4 Jun 2012 17:16:39 +0000 (10:16 -0700)
Cleanups


Trivial merge