Merge change 27410 into eclair

* changes:
  Add extension->mime type mappings