merge revision 25264 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25265 44c647ce-9c0f-0410-b52a-842ac1e357ba
merge revision 25266 to release-1.12

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25267 44c647ce-9c0f-0410-b52a-842ac1e357ba
Updated version to 1.12.2

git-svn-id: http://framework.zend.com/svn/framework/standard/branches/release-1.12@25268 44c647ce-9c0f-0410-b52a-842ac1e357ba