5.5.4
5.5.5
5.5.4
Merge remote-tracking branch 'origin/5_5_mountainlion' into 5_5_snowleopard

* origin/5_5_mountainlion:
  5.5.5
  5.5.4

Conflicts:
	build-php.pl