Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.

diff --cc configure.in
Simple merge

diff --cc ext/oci8/config.m4
Simple merge

diff --cc ext/simplexml/config.m4
Simple merge