Restoring changes from revisions 1479-3093. The changes were lost when revision 3140 overwrote them.
Restoring changes from revisions 1479-3093.
The changes were lost when revision 3140 overwrote them.

git-svn-id: b6e219894c353fb1d215c78b2075057d8daadfba@3518 44c647ce-9c0f-0410-b52a-842ac1e357ba

tjohns/zf,tjohns/zf,svn2github/zend_framework,svn2github/zend_framework,svn2github/zend_framework,jupeter/zf1,tjohns/zf,svn2github/zend_framework,jupeter/zf1,svn2github/zend_framework,jupeter/zf1