Merge pull request #149 from flooey/master
authorDan Vanderkam <danvdk@gmail.com>
Fri, 11 May 2012 18:43:10 +0000 (11:43 -0700)
committerDan Vanderkam <danvdk@gmail.com>
Fri, 11 May 2012 18:43:10 +0000 (11:43 -0700)
Three bug fixes


Trivial merge