Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed compiler reenterability
  Fixed compiler reenterability

diff --cc Zend/zend_language_scanner.c
index 07ccb5d751a2f42a5ea28499c7759ab182ceb929,48be8eaf7de3f5fb609a39c43ae9a66ff2ff7ae9..f456b97d945b25c6f2dd127b63cf9082296f0d65
--- 1/Zend/zend_language_scanner.c
--- 2/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Mon Aug 20 13:34:50 2012 */
 -/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */
++/* Generated by re2c 0.13.5 on Wed Nov 14 18:04:29 2012 */
  #line 1 "Zend/zend_language_scanner.l"
  /*
     +----------------------------------------------------------------------+

diff --cc Zend/zend_language_scanner_defs.h
index 47df7e92de3166463215df34c3b5ef6f2923f0f6,de220af71bb5743970be8e765b85ae6fb022160d..9906febe30a8b20d1629fa76c6ca8a552be59366
--- 1/Zend/zend_language_scanner_defs.h
--- 2/Zend/zend_language_scanner_defs.h
+++ b/Zend/zend_language_scanner_defs.h
@@@ -1,4 -1,4 +1,4 @@@
- /* Generated by re2c 0.13.5 on Mon Aug 20 13:34:50 2012 */
 -/* Generated by re2c 0.13.5 on Wed Nov 14 17:50:16 2012 */
++/* Generated by re2c 0.13.5 on Wed Nov 14 18:04:29 2012 */
  #line 3 "Zend/zend_language_scanner_defs.h"
  
  enum YYCONDTYPE {