Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
index 866502a4d9912e2cd8e0b279dc29d99aedc5e372,6e466e40b17e9fa0aad4f51137399c87f2ab5ad0..f7d73017cd960530a3646923ae5d407ee150163f
--- 1/Zend/zend_vm_execute.h
--- 2/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -1422,8 -1392,7 +1422,7 @@@ static int ZEND_FASTCALL  ZEND_BRK_SPEC
  
        SAVE_OPLINE();
        el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 -                         EX(op_array), EX_Ts() TSRMLS_CC);
 +                         EX(op_array), execute_data TSRMLS_CC);
- 
        ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
  }
  
@@@ -1434,8 -1403,7 +1433,7 @@@ static int ZEND_FASTCALL  ZEND_CONT_SPE
  
        SAVE_OPLINE();
        el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
 -                         EX(op_array), EX_Ts() TSRMLS_CC);
 +                         EX(op_array), execute_data TSRMLS_CC);
- 
        ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
  }