Merge branch 'PHP-5.5'
Merge branch 'PHP-5.4'
Add an empty make command for DTrace .d files to stop an implicit
circular dependency in GNU Make which causes .d files to be
overwritten (Bug 61268)
Merge branch 'PHP-5.5'

* PHP-5.5:
  Merge branch 'PHP-5.5'
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'

Conflicts:
	ext/mysqlnd/mysqlnd.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  Add an empty make command for DTrace .d files to stop an implicit circular dependency in GNU Make which causes .d files to be overwritten (Bug 61268)
  Merge branch 'PHP-5.4'