auto upstream

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 969d3c7d269..72842ad188d 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * url-cache.el (url-cache-create-filename-using-md5): Don't waste your
+        time `requiring' a builtin feature.
+
 2012-12-22  Takafumi Arakaki  <aka.tkf@gmail.com>  (tiny change)
 
         * url-http.el (url-http-end-of-document-sentinel): Bind relevant
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index a5e5ebf1ed4..cb0281b87f2 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -149,7 +149,6 @@ The actual return value is the last modification time of the cache file."
 (defun url-cache-create-filename-using-md5 (url)
   "Create a cached filename using MD5.
 Very fast if you have an `md5' primitive function, suitably fast otherwise."
-  (require 'md5)
   (if url
       (let* ((checksum (md5 url))
              (urlobj (url-generic-parse-url url))