5.4.28
5.4.29
5.4.28
Merge remote-tracking branch 'origin/4_4_mountainlion' into 5_4_snowleopard

* origin/5_4_mountainlion:
  5.4.29
  5.4.28

Conflicts:
	build-php.pl