Merge branch 'hotfix/122'
authorMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:32:59 +0000 (15:32 -0500)
committerMatthew Weier O'Phinney <matthew@zend.com>
Wed, 3 Oct 2012 20:32:59 +0000 (15:32 -0500)
Close #122


Trivial merge