merge with trunk r1301894

Unregistered media types in common use, according to Wikipedia and MS.
New IANA media types as of 2012 Mar 16 18:55 PDT.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1301896 13f79535-47bb-0310-9956-ffa450edef68