Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Make sure the generator script also creates a newline at the end of file
  Add newline at end of file to prevent compilation warning

diff --cc Zend/zend_vm_gen.php
Simple merge

diff --cc Zend/zend_vm_opcodes.h
index 911eee443440ced77f0dc4da85e0b3d384b82204,5e4bf4d05ac1135a1b377cd5052af49d9b054f93..4ed726d217f47f031c9a877247e511c78fde09e4
--- 1/Zend/zend_vm_opcodes.h
--- 2/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -164,10 -164,5 +164,10 @@@ ZEND_API const char *zend_get_opcode_na
  #define ZEND_SEPARATE                        156
  #define ZEND_QM_ASSIGN_VAR                   157
  #define ZEND_JMP_SET_VAR                     158
 +#define ZEND_DISCARD_EXCEPTION               159
 +#define ZEND_YIELD                           160
 +#define ZEND_GENERATOR_RETURN                161
 +#define ZEND_FAST_CALL                       162
 +#define ZEND_FAST_RET                        163
  
- #endif
+ #endif