5.3.23RC1
5.4.24-dev
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  5.4.24-dev
  5.3.23RC1

Conflicts:
	configure.in
	main/php_version.h