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

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

* PHP-5.5:
  fix ident
updated libmagic.patch
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  updated libmagic.patch
Merge branch 'PHP-5.5'

* PHP-5.5:
  updated libmagic.patch