Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Traits refactoring

diff --cc Zend/zend.h
Simple merge

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_compile.h
Simple merge

diff --cc Zend/zend_language_parser.y
Simple merge

diff --cc Zend/zend_opcode.c
Simple merge