fix typo
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix typo
non living code related typo fixes
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  non living code related typo fixes