* Merge from debian unstable. Remaining changes: - Don't copy the default site directly into /var/www/ in the package, but instead keep it in /usr/share/nginx/nginx-default and move it to /var/www/nginx-default/ just after installation. (LP: #547267) * debian/patches/nginx-html5-codecs.diff - Add support for html5 codecs (LP: #674224)