Merge pull request #579 from rui314/master
authorEvan Martin <martine@danga.com>
Thu, 23 May 2013 21:09:55 +0000 (14:09 -0700)
committerEvan Martin <martine@danga.com>
Thu, 23 May 2013 21:09:55 +0000 (14:09 -0700)
Minor fixes


Trivial merge