Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17
Enable dtrace probes on linux as they are compatible with systemtap

You can build php with dtrace probes enabled on linux if you have
systemtap with uprobes.
Fixed bug #62691 (solaris sed has no -i switch)
Make 'make distclean' remove generated DTrace .h file
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17

Conflicts:
	Makefile.global
NEWS for recent DTrace merges.
Remove redundant 'cp' during DTrace install.
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
Merge branch 'PHP-5.5'

* PHP-5.5:
  NEWS for recent DTrace merges. Remove redundant 'cp' during DTrace install.
  Fixed bug #62691 (solaris sed has no -i switch) Make 'make distclean' remove generated DTrace .h file
  Enable dtrace probes on linux as they are compatible with systemtap
  Fixed bug #63706: Cannot build PHP-5.5 with --enable-dtrace on Fedora 17