Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Wed, 19 Sep 2012 11:44:18 +0000 (19:44 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 19 Sep 2012 11:44:18 +0000 (19:44 +0800)

Trivial merge