Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4

Conflicts:
	NEWS
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Fixed segfault in mysqlnd when doing long prepare
Fixed pgsql_stmt_get_column_meta() OID signedness
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed pgsql_stmt_get_column_meta() OID signedness
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed pgsql_stmt_get_column_meta() OID signedness