* cmdline/apt-key:

  - fix apt-key net-update, thanks to Marc Deslauriers and
    Adam Conrad for the code review (LP: #857472)

diff --cc debian/changelog
index e3944d76953f5539051037c8f9e2cdf2e7a7c2ad,88b614ca141f3a7b794c0764917e4e67fd48bcbd..a0f59e019b7d065160183a574b212bc756098326
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,3 +1,26 @@@
- apt (0.8.16~exp5ubuntu13) UNRELEASED; urgency=low
++apt (0.8.16~exp5ubuntu13) UNRELEASEDoneiric; urgency=low
 +
++  [ Adam Conrad ]
 +  * On armel, call update-apt-xapian-index with '-u' to keep the CPU
 +    and I/O usage low.  We would do this on all arches, but there's a
 +    regression risk here, but that's better than killing slow systems.
++  
++  [ Michael Vogt ]
++  * cmdline/apt-key:
++    - fix apt-key net-update, thanks to Marc Deslauriers and 
++      Adam Conrad for the code review (LP: #857472)
 +
-  -- Adam Conrad <adconrad@ubuntu.com>  Tue, 04 Oct 2011 01:24:01 -0600
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 06 Oct 2011 16:13:00 +0200
 +
 +apt (0.8.16~exp5ubuntu12) oneiric; urgency=low
 +
 +  [ David Kalnischkies ]  
 +  * apt-pkg/deb/deblistparser.cc:
 +    - fix crash when the dynamic mmap needs to be remapped during
 +      LoadReleaseInfo (LP: #854090)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 26 Sep 2011 13:31:11 +0200
 +
  apt (0.8.16~exp5ubuntu11) oneiric; urgency=low
  
    [ Colin Watson ]