Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
typo and WS
Merge branch 'PHP-5.5'

* PHP-5.5:
  typo and WS
Merge branch 'master' of git.php.net:php-src