merged trunk

diff --combined debian/changelog
index 450a9c3827e8a2084a70ac3c344a351ba94aa7f8,7d22ba396ca462f7dd13c9f1b0b809db7c4df203..aa8553251f4acf7272f8236b73328775dd793aae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
 -apt (0.9.8.2) UNRELEASED; urgency=low
 +apt (0.9.8.2) unstable; urgency=low
  
    [ Programs translations ]
    * French translation : typo fix. Closes: #677272
@@@ -17,7 -17,12 +17,13 @@@
    * Fix crash when the "mirror" method does not find any entry
      (closes: #699303)
  
 - -- Christian Perrier <bubulle@debian.org>  Thu, 16 May 2013 22:28:22 +0200
++
+   [ Johan Kiviniemi ]
+   * cmdline/apt-key:
+     - Create new keyrings with mode 0644 instead of 0600.
+     - Accept a nonexistent --keyring file with the adv subcommand as well.
+ 
 + -- Michael Vogt <mvo@debian.org>  Thu, 06 Jun 2013 19:15:14 +0200
  
  apt (0.9.8.1) unstable; urgency=low