merge from trunk r774530

# This is a comment. I love comments.

# This file controls what Internet media types are sent to the client for

# given file extension(s).  Sending the correct media type to the client

# is important so they know how to handle the content of the file.

# Extra types can either be added here or by using an AddType directive

# in your config files. For more information about Internet media types,

# please read RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type

# registry is at <http://www.iana.org/assignments/media-types/>.

# This file maps Internet media types to unique file extension(s).

# Although created for httpd, this file is used by many software systems

# and has been placed in the public domain for unlimited redisribution.

#

# The table below contains both registered and (common) unregistered types.

# A type that has no unique extension can be ignored -- they are listed

# here to guide configurations toward known types and to make it easier to

# identify "new" types.  File extensions are also commonly used to indicate

# content languages and encodings, so choose them carefully.

#

# Internet media types should be registered as described in RFC 4288.

# The registry is at <http://www.iana.org/assignments/media-types/>.

#

# MIME type					Extensions

application/activemessage

application/andrew-inset			ez

application/applefile

application/applixware				aw

application/atom+xml				atom

application/atomcat+xml				atomcat

application/atomicmail

application/beep+xml

application/cals-1840

application/ccxml+xml				ccxml

application/cea-2018+xml

application/cellml+xml

application/cnrp+xml

application/commonground

application/cpl+xml

application/csta+xml

application/cstadata+xml

application/cu-seeme				cu

application/cybercash

application/davmount+xml			davmount

application/dca-rft

application/edi-consent

application/edi-x12

application/edifact

application/emma+xml				emma

application/epp+xml

application/epub+zip				epub

application/eshop

application/example

application/fastinfoset

application/fastsoap

application/fits

application/h224

application/http

application/hyperstudio				stk

application/ibe-key-request+xml

application/ibe-pkg-reply+xml

application/ibe-pp-data

application/iges

application/im-iscomposing+xml

application/index

application/iotp

application/ipp

application/isup

application/java-archive			jar

application/java-serialized-object		ser

application/java-vm				class

application/javascript				js

application/json				json

application/kpml-request+xml

application/msword				doc dot

application/mxf					mxf

application/nasdata

application/news-checkgroups

application/news-groupinfo

application/news-transmission

application/nss

application/ocsp-request

application/ocsp-response

application/octet-stream bin dms lha lzh class so iso dmg dist distz pkg bpk dump elc

application/octet-stream bin dms lha lrf lzh so iso dmg dist distz pkg bpk dump elc

application/oda					oda

application/oebps-package+xml

application/oebps-package+xml			opf

application/ogg					ogx

application/onenote				onetoc onetoc2 onetmp onepkg

application/parityfec

application/patch-ops-error+xml			xer

application/pdf					pdf

application/vnd.accpac.simply.imp		imp

application/vnd.acucobol			acu

application/vnd.acucorp				atc acutc

application/vnd.adobe.air-application-installer-package+zip	air

application/vnd.adobe.xdp+xml			xdp

application/vnd.adobe.xfdf			xfdf

application/vnd.aether.imp

application/vnd.airzip.filesecure.azf		azf

application/vnd.airzip.filesecure.azs		azs

application/vnd.amazon.ebook			azw

application/vnd.americandynamics.acc		acc

application/vnd.amiga.ami			ami

application/vnd.android.package-archive		apk

application/vnd.anser-web-certificate-issue-initiation	cii

application/vnd.anser-web-funds-transfer-initiation	fti

application/vnd.antix.game-component		atx

application/vnd.autopackage

application/vnd.avistar+xml

application/vnd.blueice.multipass		mpm

application/vnd.bluetooth.ep.oob

application/vnd.bmi				bmi

application/vnd.businessobjects			rep

application/vnd.cab-jscript

application/vnd.cups-ppd			ppd

application/vnd.cups-raster

application/vnd.cups-raw

application/vnd.curl				curl

application/vnd.curl.car			car

application/vnd.curl.pcurl			pcurl

application/vnd.cybank

application/vnd.data-vision.rdz			rdz

application/vnd.denovo.fcselayout-link		fe_launch

application/vnd.dir-bi.plate-dl-nosuffix

application/vnd.dna				dna

application/vnd.dolby.mlp			mlp

application/vnd.dolby.mobile.1

application/vnd.dolby.mobile.2

application/vnd.dpgraph				dpg

application/vnd.dreamfactory			dfac

application/vnd.dvb.esgcontainer

application/vnd.dvb.ipdcdftnotifaccess

application/vnd.dvb.ipdcesgaccess

application/vnd.dvb.ipdcroaming

application/vnd.dvb.iptv.alfec-base

application/vnd.dvb.iptv.alfec-enhancement

application/vnd.dvb.notif-aggregate-root+xml

application/vnd.dvb.notif-container+xml

application/vnd.dvb.notif-generic+xml

application/vnd.dvb.notif-ia-msglist+xml

application/vnd.dvb.notif-ia-registration-request+xml

application/vnd.dvb.notif-ia-registration-response+xml

application/vnd.dvb.notif-init+xml

application/vnd.dxr

application/vnd.dynageo				geo

application/vnd.ecdis-update

application/vnd.ecowin.chart			mag

application/vnd.ecowin.filerequest

application/vnd.ecowin.series

application/vnd.ecowin.seriesrequest

application/vnd.ecowin.seriesupdate

application/vnd.emclient.accessrequest+xml

application/vnd.enliven				nml

application/vnd.epson.esf			esf

application/vnd.epson.msf			msf

application/vnd.epson.ssf			ssf

application/vnd.ericsson.quickcall

application/vnd.eszigno3+xml			es3 et3

application/vnd.etsi.aoc+xml

application/vnd.etsi.cug+xml

application/vnd.etsi.iptvcommand+xml

application/vnd.etsi.iptvdiscovery+xml

application/vnd.etsi.iptvprofile+xml

application/vnd.etsi.iptvsad-bc+xml

application/vnd.etsi.iptvsad-cod+xml

application/vnd.etsi.iptvsad-npvr+xml

application/vnd.etsi.iptvueprofile+xml

application/vnd.etsi.mcid+xml

application/vnd.etsi.sci+xml

application/vnd.etsi.simservs+xml

application/vnd.eudora.data

application/vnd.ezpix-album			ez2

application/vnd.ezpix-package			ez3

application/vnd.f-secure.mobile

application/vnd.fdf				fdf

application/vnd.fdsn.mseed			mseed

application/vnd.fdsn.seed			seed dataless

application/vnd.ffsns

application/vnd.fints

application/vnd.flographit			gph

application/vnd.fluxtime.clip			ftc

application/vnd.font-fontforge-sfd

application/vnd.framemaker			fm frame maker

application/vnd.framemaker			fm frame maker book

application/vnd.frogans.fnc			fnc

application/vnd.frogans.ltf			ltf

application/vnd.fsc.weblaunch			fsc

application/vnd.fut-misnet

application/vnd.fuzzysheet			fzs

application/vnd.genomatix.tuxedo		txd

application/vnd.geogebra.file			ggb

application/vnd.geogebra.tool			ggt

application/vnd.geometry-explorer		gex gre

application/vnd.gmx				gmx

application/vnd.google-earth.kml+xml		kml

application/vnd.google-earth.kmz		kmz

application/vnd.immervision-ivp			ivp

application/vnd.immervision-ivu			ivu

application/vnd.informedcontrol.rms+xml

application/vnd.informix-visionary

application/vnd.intercon.formnet		xpw xpx

application/vnd.intertrust.digibox

application/vnd.intertrust.nncp

application/vnd.ms-asf				asf

application/vnd.ms-cab-compressed		cab

application/vnd.ms-excel			xls xlm xla xlc xlt xlw

application/vnd.ms-excel.addin.macroenabled.12		xlam

application/vnd.ms-excel.sheet.binary.macroenabled.12	xlsb

application/vnd.ms-excel.sheet.macroenabled.12		xlsm

application/vnd.ms-excel.template.macroenabled.12	xltm

application/vnd.ms-fontobject			eot

application/vnd.ms-htmlhelp			chm

application/vnd.ms-ims				ims

application/vnd.ms-lrm				lrm

application/vnd.ms-pki.seccat			cat

application/vnd.ms-pki.stl			stl

application/vnd.ms-playready.initiator+xml

application/vnd.ms-powerpoint			ppt pps pot

application/vnd.ms-powerpoint.addin.macroenabled.12		ppam

application/vnd.ms-powerpoint.presentation.macroenabled.12	pptm

application/vnd.ms-powerpoint.slide.macroenabled.12		sldm

application/vnd.ms-powerpoint.slideshow.macroenabled.12		ppsm

application/vnd.ms-powerpoint.template.macroenabled.12		potm

application/vnd.ms-project			mpp mpt

application/vnd.ms-tnef

application/vnd.ms-wmdrm.lic-chlg-req

application/vnd.ms-wmdrm.lic-resp

application/vnd.ms-wmdrm.meter-chlg-req

application/vnd.ms-wmdrm.meter-resp

application/vnd.ms-word.document.macroenabled.12	docm

application/vnd.ms-word.template.macroenabled.12	dotm

application/vnd.ms-works			wps wks wcm wdb

application/vnd.ms-wpl				wpl

application/vnd.ms-xpsdocument			xps

application/vnd.novadigm.ext			ext

application/vnd.oasis.opendocument.chart		odc

application/vnd.oasis.opendocument.chart-template	otc

application/vnd.oasis.opendocument.database		odb

application/vnd.oasis.opendocument.formula		odf

application/vnd.oasis.opendocument.formula-template	otf

application/vnd.oasis.opendocument.formula-template	odft

application/vnd.oasis.opendocument.graphics		odg

application/vnd.oasis.opendocument.graphics-template	otg

application/vnd.oasis.opendocument.image		odi

application/vnd.omads-folder+xml

application/vnd.omaloc-supl-init

application/vnd.openofficeorg.extension		oxt

application/vnd.openxmlformats-officedocument.presentationml.presentation pptx

application/vnd.openxmlformats-officedocument.presentationml.slide	sldx

application/vnd.openxmlformats-officedocument.presentationml.slideshow	ppsx

application/vnd.openxmlformats-officedocument.presentationml.template	potx

application/vnd.openxmlformats-officedocument.spreadsheetml.sheet	xlsx

application/vnd.openxmlformats-officedocument.spreadsheetml.template	xltx

application/vnd.openxmlformats-officedocument.wordprocessingml.document	docx

application/vnd.openxmlformats-officedocument.wordprocessingml.template	dotx

application/vnd.osa.netdeploy

application/vnd.osgi.bundle

application/vnd.osgi.dp				dp

application/vnd.otps.ct-kip+xml

application/vnd.palm				prc pdb pqa oprc

application/vnd.palm				pdb pqa oprc

application/vnd.paos.xml

application/vnd.pg.format			str

application/vnd.pg.osasli			ei6

application/vnd.quark.quarkxpress		qxd qxt qwd qwt qxl qxb

application/vnd.rapid

application/vnd.recordare.musicxml		mxl

application/vnd.recordare.musicxml+xml

application/vnd.recordare.musicxml+xml		musicxml

application/vnd.renlearn.rlprint

application/vnd.rim.cod				cod

application/vnd.rn-realmedia			rm

application/vnd.route66.link66+xml		link66

application/vnd.ruckus.download

application/vnd.s3sms

application/vnd.sbm.cid

application/vnd.sbm.mid2

application/vnd.scribus

application/vnd.sealed.3df

application/vnd.shana.informed.package		ipk

application/vnd.simtech-mindmapper		twd twds

application/vnd.smaf				mmf

application/vnd.smart.teacher			teacher

application/vnd.software602.filler.form+xml

application/vnd.software602.filler.form-xml-zip

application/vnd.solent.sdkm+xml			sdkm sdkd

application/vnd.sss-cod

application/vnd.sss-dtf

application/vnd.sss-ntf

application/vnd.stardivision.calc		sdc

application/vnd.stardivision.draw		sda

application/vnd.stardivision.impress		sdd

application/vnd.stardivision.math		smf

application/vnd.stardivision.writer		sdw

application/vnd.stardivision.writer		vor

application/vnd.stardivision.writer-global	sgl

application/vnd.street-stream

application/vnd.sun.xml.calc			sxc

application/vnd.sun.xml.calc.template		stc

application/vnd.sun.xml.draw			sxd

application/vnd.sun.xml.draw.template		std

application/vnd.sun.xml.impress			sxi

application/vnd.sun.xml.impress.template	sti

application/vnd.sun.xml.math			sxm

application/vnd.sun.xml.writer			sxw

application/vnd.sun.xml.writer.global		sxg

application/vnd.sun.xml.writer.template		stw

application/vnd.sun.wadl+xml

application/vnd.sus-calendar			sus susp

application/vnd.svd				svd

application/vnd.swiftview-ics

application/vnd.symbian.install			sis sisx

application/vnd.syncml+xml			xsm

application/vnd.syncml.dm+wbxml			bdm

application/vnd.syncml.dm+xml			xdm

application/vnd.syncml.dm.notification

application/vnd.syncml.ds.notification

application/vnd.tao.intent-module-archive	tao

application/vnd.tmobile-livetv			tmo

application/vnd.wv.ssp+xml

application/vnd.xara				xar

application/vnd.xfdl				xfdl

application/vnd.xfdl.webform

application/vnd.xmi+xml

application/vnd.xmpie.cpkg

application/vnd.xmpie.dpkg

application/vnd.yamaha.hv-dic			hvd

application/vnd.yamaha.hv-script		hvs

application/vnd.yamaha.hv-voice			hvp

application/vnd.yamaha.openscoreformat			osf

application/vnd.yamaha.openscoreformat.osfpvg+xml	osfpvg

application/vnd.yamaha.smaf-audio		saf

application/vnd.yamaha.smaf-phrase		spf

application/vnd.yellowriver-custom-menu		cmp

application/vnd.zul				zir zirz

application/vnd.zzazz.deck+xml			zaz

application/voicexml+xml			vxml

application/watcherinfo+xml

application/wordperfect5.1

application/wsdl+xml				wsdl

application/wspolicy+xml			wspolicy

application/x-abiword				abw

application/x-ace-compressed			ace

application/x-authorware-bin			aab x32 u32 vox

application/x-authorware-map			aam

application/x-authorware-seg			aas

application/x-bcpio				bcpio

application/x-bittorrent			torrent

application/x-bzip				bz

application/x-compress

application/x-cpio				cpio

application/x-csh				csh

application/x-director				dcr dir dxr fgd

application/x-debian-package			deb udeb

application/x-director			dir dcr dxr cst cct cxt w3d fgd swa

application/x-doom				wad

application/x-dtbncx+xml			ncx

application/x-dtbook+xml			dtb

application/x-dtbresource+xml			res

application/x-dvi				dvi

application/x-font-bdf				bdf

application/x-font-dos

application/x-font-framemaker

application/x-font-ghostscript			gsf

application/x-font-libgrx

application/x-font-linux-psf			psf

application/x-font-otf				otf

application/x-font-pcf				pcf

application/x-font-snf				snf

application/x-font-speedo

application/x-font-sunos-news

application/x-font-ttf				ttf ttc

application/x-font-type1			pfa pfb pfm afm

application/x-font-vfont

application/x-futuresplash			spl

application/x-gnumeric				gnumeric

application/x-gtar				gtar

application/x-gzip

application/x-hdf				hdf

application/x-java-jnlp-file			jnlp

application/x-latex				latex

application/x-mobipocket-ebook			prc mobi

application/x-ms-wmd				wmd

application/x-ms-wmz				wmz

application/x-msaccess				mdb

application/x-tar				tar

application/x-tcl				tcl

application/x-tex				tex

application/x-tex-tfm				tfm

application/x-texinfo				texinfo texi

application/x-ustar				ustar

application/x-wais-source			src

application/x-x509-ca-cert			der crt

application/x-xfig				fig

application/x-xpinstall				xpi

application/x400-bp

application/xcap-att+xml

application/xcap-caps+xml

application/xcap-el+xml

application/xcap-error+xml

application/xcap-ns+xml

application/xcon-conference-info-diff+xml

application/xcon-conference-info+xml

application/xenc+xml				xenc

application/xhtml+xml				xhtml xht

application/xhtml-voice+xml

application/xml					xml xsl

application/xml-dtd				dtd

application/xml-external-parsed-entity

audio/3gpp

audio/3gpp2

audio/ac3

audio/adpcm					adp

audio/amr

audio/amr-wb

audio/amr-wb+

audio/evrcwb

audio/evrcwb0

audio/evrcwb1

audio/example

audio/g719

audio/g722

audio/g7221

audio/g723

audio/ogg					oga ogg spx

audio/parityfec

audio/pcma

audio/pcma-wb

audio/pcmu-wb

audio/pcmu

audio/prs.sid

audio/qcelp

audio/vnd.cns.inf1

audio/vnd.digital-winds				eol

audio/vnd.dlna.adts

audio/vnd.dolby.heaac.1

audio/vnd.dolby.heaac.2

audio/vnd.dolby.mlp

audio/vnd.dolby.mps

audio/vnd.dolby.pl2

audio/vnd.dolby.pl2x

audio/vnd.dolby.pl2z

audio/vnd.dts					dts

audio/vnd.dts.hd				dtshd

audio/vnd.everad.plj

audio/vorbis

audio/vorbis-config

audio/wav					wav

audio/x-aac					aac

audio/x-aiff					aif aiff aifc

audio/x-mpegurl					m3u

audio/x-ms-wax					wax

chemical/x-xyz					xyz

image/bmp					bmp

image/cgm					cgm

image/example

image/fits

image/g3fax					g3

image/gif					gif

image/vnd.mix

image/vnd.ms-modi				mdi

image/vnd.net-fpx				npx

image/vnd.radiance

image/vnd.sealed.png

image/vnd.sealedmedia.softseal.gif

image/vnd.sealedmedia.softseal.jpg

image/vnd.xiff					xif

image/x-cmu-raster				ras

image/x-cmx					cmx

image/x-freehand				fh fhc fh4 fh5 fh7

image/x-icon					ico

image/x-pcx					pcx

image/x-pict					pic pct

message/cpim

message/delivery-status

message/disposition-notification

message/example

message/external-body

message/global

message/global-delivery-status

message/global-disposition-notification

message/global-headers

message/http

message/imdn+xml

message/news

message/partial

message/rfc822					eml mime

message/sipfrag

message/tracking-status

message/vnd.si.simp

model/example

model/iges					igs iges

model/mesh					msh mesh silo

model/vnd.dwf					dwf

model/vnd.flatland.3dml

model/vnd.gdl					gdl

model/vnd.gs-gdl

model/vnd.gs.gdl

model/vnd.gtw					gtw

model/vnd.moml+xml

multipart/byteranges

multipart/digest

multipart/encrypted

multipart/example

multipart/form-data

multipart/header-set

multipart/mixed

text/csv					csv

text/directory

text/dns

text/ecmascript

text/enriched

text/example

text/html					html htm

text/javascript

text/parityfec

text/plain					txt text conf def list log in

text/prs.fallenstein.rst

text/ulpfec

text/uri-list					uri uris urls

text/vnd.abc

text/vnd.curl

text/vnd.curl					curl

text/vnd.curl.dcurl				dcurl

text/vnd.curl.scurl				scurl

text/vnd.curl.mcurl				mcurl

text/vnd.dmclientscript

text/vnd.esmertec.theme-descriptor

text/vnd.fly					fly

video/bt656

video/celb

video/dv

video/example

video/h261					h261

video/h263					h263

video/h263-1998

video/vnd.sealed.swf

video/vnd.sealedmedia.softseal.mov

video/vnd.vivo					viv

video/x-f4v					f4v

video/x-fli					fli

video/x-flv					flv

video/x-m4v					m4v

video/x-ms-asf					asf asx

video/x-ms-wm					wm

video/x-ms-wmv					wmv