Merge pull request #274 from iainlane/master
authorZoltan Varga <vargaz@gmail.com>
Tue, 17 Apr 2012 16:34:48 +0000 (09:34 -0700)
committerZoltan Varga <vargaz@gmail.com>
Tue, 17 Apr 2012 16:34:48 +0000 (09:34 -0700)
Merge two smallish fixes


Trivial merge