fix regression, take #2 (merge issue due to git 1.8 default setting changes)
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5