Refactor fileinfo
Merge branch 'phpng' of git.php.net:php-src into phpng