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


Trivial merge