Merge branch 'PHP-5.4' of git://github.com/php/php-src into PHP-5.4
authorLars Strojny <lstrojny@php.net>
Tue, 21 Aug 2012 08:09:23 +0000 (10:09 +0200)
committerLars Strojny <lstrojny@php.net>
Tue, 21 Aug 2012 08:09:23 +0000 (10:09 +0200)

Trivial merge