yahoo/mojito — pull request #497 by imalberto (2012-09-13 17:23:51+00:00)
Title: Fixes based on Ric's changes

Please do Ric PR first before applying this one