Merge branch 'cleanup'
authormelinath <stephen.r.burrows@gmail.com>
Wed, 9 Jun 2010 17:49:56 +0000 (13:49 -0400)
committermelinath <stephen.r.burrows@gmail.com>
Wed, 9 Jun 2010 17:49:56 +0000 (13:49 -0400)

Trivial merge