Fixed segfault in mysqlnd when doing long prepare
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

Conflicts:
	NEWS