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