Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_def.h

diff --cc Zend/zend_vm_def.h
index ca62ddecc08cd1b49b52044b931dd94bbafff322,3d84a3790512c49d8bd7c42480fb9458c185a63c..9986e20bb76ad79ddd703cdf5500d7a96b1163e2
--- 1/Zend/zend_vm_def.h
--- 2/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@@ -3295,8 -3267,7 +3295,7 @@@ ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONS
  
        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);
-       FREE_OP2();
        ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
  }
  
@@@ -3307,8 -3278,7 +3306,7 @@@ ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CON
  
        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);
-       FREE_OP2();
        ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
  }