Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 11:33:27 +0000 (19:33 +0800)
committerXinchen Hui <laruence@php.net>
Thu, 2 Aug 2012 11:33:27 +0000 (19:33 +0800)

Trivial merge