Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
ws and comment for recommended aa method
Merge branch 'PHP-5.5'

* PHP-5.5:
  ws and comment for recommended aa method