Merge r25190 to 1.12 release branch

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

tests/Zend/Form/Element/SelectTest.php

@@ -263,7 +263,7 @@ class Zend_Form_Element_SelectTest extends PHPUnit_Framework_TestCase
         $expected = PHP_EOL
                   . '<select name="foo[]" id="foo">'
                   . PHP_EOL
-                  . '    <option value="bar" label="Bar">Bar</option>'
+                  . '    <option value="bar">Bar</option>'
                   . PHP_EOL
                   . '</select>';