Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_opcodes.c

diff --cc Zend/Makefile.am
Simple merge

diff --cc Zend/Zend.dsp
Simple merge

diff --cc Zend/ZendTS.dsp
Simple merge

diff --cc Zend/zend_vm_gen.php
Simple merge

diff --cc Zend/zend_vm_opcodes.c
index 55a0de12e927deba1d02af523c8e85f162278164,d5e7b826cba0438a964c945491b8091c7412ea4e..c565510facd1adef0eaceebfb58a1d23ca7e1db3
--- 1/Zend/zend_vm_opcodes.c
--- 2/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@@ -18,7 -18,9 +18,9 @@@
     +----------------------------------------------------------------------+
  */
  
 -const char *zend_vm_opcodes_map[159] = {
+ #include <stdio.h>
+ 
 +const char *zend_vm_opcodes_map[164] = {
        "ZEND_NOP",
        "ZEND_ADD",
        "ZEND_SUB",

diff --cc configure.in
Simple merge

diff --cc win32/build/config.w32
Simple merge