Merge pull request #333 from jonforums/no-main-multi-defs
authorEvan Martin <martine@danga.com>
Sat, 16 Jun 2012 17:01:45 +0000 (10:01 -0700)
committerEvan Martin <martine@danga.com>
Sat, 16 Jun 2012 17:01:45 +0000 (10:01 -0700)
Prevent multiple definition link error


Trivial merge