nginx-0.3.16-RELEASE import

    *) Feature: the ngx_http_map_module.

    *) Feature: the "types_hash_max_size" and "types_hash_bucket_size"
       directives.

    *) Feature: the "ssi_value_length" directive.

    *) Feature: the "worker_rlimit_core" directive.

    *) Workaround: the connection number in logs was always 1 if nginx was
       built by the icc 8.1 or 9.0 compilers with optimization for
       Pentium 4.

    *) Bugfix: the "config timefmt" SSI command set incorrect time format.

    *) Bugfix: nginx did not close connection to IMAP/POP3 backend for the
       SSL connections; the bug had appeared in 0.3.13.
       Thanks to Rob Mueller.

    *) Bugfix: segmentation fault may occurred in at SSL shutdown; the bug
       had appeared in 0.3.13.
diff --git a/conf/mime.types b/conf/mime.types
index 079874e..e17c3d1 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -1,14 +1,16 @@
 
 types {
-    text/css                              css;
     text/html                             html htm shtml;
-    text/plain                            txt;
+    text/css                              css;
     text/xml                              xml rss;
+    image/gif                             gif;
+    image/jpeg                            jpeg jpg;
+    application/x-javascript              js;
+
+    text/plain                            txt;
     text/x-component                      htc;
     text/mathml                           mml;
 
-    image/gif                             gif;
-    image/jpeg                            jpeg jpg;
     image/png                             png;
     image/x-icon                          ico;
     image/x-jng                           jng;
@@ -17,7 +19,6 @@
     application/mac-binhex40              hqx;
     application/pdf                       pdf;
     application/x-cocoa                   cco;
-    application/x-javascript              js;
     application/x-java-archive-diff       jardiff;
     application/x-java-jnlp-file          jnlp;
     application/x-makeself                run;