auto upstream

2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index e8db8d61481..dd93c7b22fe 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-09  Daiki Ueno  <ueno@gnu.org>
+
+        * mml-smime.el (epg-sub-key-fingerprint): Autoload for
+        mml-smime-epg-find-usable-secret-key.
+
 2013-01-08  Glenn Morris  <rgm@gnu.org>
 
         * mml-smime.el (mml-smime-sign-with-sender): Add :version.
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 22f88b4ae75..e5e99dedcbe 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -329,6 +329,7 @@ Whether the passphrase is cached at all is controlled by
   (autoload 'epg-encrypt-string "epg")
   (autoload 'epg-passphrase-callback-function "epg")
   (autoload 'epg-context-set-passphrase-callback "epg")
+  (autoload 'epg-sub-key-fingerprint "epg")
   (autoload 'epg-configuration "epg-config")
   (autoload 'epg-expand-group "epg-config")
   (autoload 'epa-select-keys "epa"))