Included new .c file in build too
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_opcodes.c