Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
authorXinchen Hui <laruence@php.net>
Tue, 15 Jan 2013 07:32:42 +0000 (15:32 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 15 Jan 2013 07:32:42 +0000 (15:32 +0800)

Trivial merge