Fixed segfault in mysqlnd when doing long prepare
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS
Merge branch 'PHP-5.5'
Merge branch 'master' of ssh://git.php.net/php-src