Update to upstream release 1.4.7
Merge branch 'master' of git://pkgs.fedoraproject.org/nginx into fedora

Conflicts:
	nginx.spec
Merge branch 'fedora'