prep for 5.4.27 rc1
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  prep for 5.4.27 rc1

Conflicts:
	configure.in
	main/php_version.h