Re-applyed Bob's patch with minor fixes
Merge branch 'phpng' of git.php.net:php-src into phpng

* 'phpng' of git.php.net:php-src:
  fix exif, thnx laruence