Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Mon, 10 Dec 2012 12:29:38 +0000 (20:29 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 10 Dec 2012 12:29:38 +0000 (20:29 +0800)

Trivial merge