Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Tue, 21 Aug 2012 05:33:23 +0000 (13:33 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 21 Aug 2012 05:33:23 +0000 (13:33 +0800)

Trivial merge