merge with debian-experimental-ma

* Swedish translation update. Closes: #592366
* apt-pkg/pkgcache.cc:
  - re-evaluate the architectures cache when the cache is (re)opened
* apt-pkg/cdrom.cc:
  - fix off-by-one error in DropBinaryArch
* apt-pkg/contrib/fileutl.cc:
  - Add WriteAtomic mode.
  - Revert WriteEmpty to old behavior (LP: #613211)
* apt-pkg, methods:
  - Convert users of WriteEmpty to WriteAtomic.
* apt-pkg/depcache.cc:
  - Only try upgrade for Breaks if there is a newer version, otherwise
    handle it as Conflicts (by removing it) (helps for #591882).
* debian/control:
  - Add dependency on gnupg to apt, apt-key uses it.

diff --cc apt-pkg/pkgcache.cc
Simple merge

diff --cc debian/changelog
index 69b1649c6f19e2a1a6e5df5c4af9ea0f1f679891,6945b48f59247dc2954d27478807acb79afecc62..1207fb52fad270097d5cee9fc112a2e4e6fb8867
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,26 +1,36 @@@
 -apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low
 +apt (0.8.0~pre1) UNRELASED; urgency=low
 +
++  [ Programs translations ]
++  * Swedish translation update. Closes: #592366
+ 
    [ Michael Vogt ]
 +  * merge of the debian-expermental-ma branch
 +  * refresh po/pot files in doc/ and po/
+   * apt-pkg/pkgcache.cc:
+     - re-evaluate the architectures cache when the cache is (re)opened
  
-   [ Programs translations ]
-   * Swedish translation update. Closes: #592366
+   [ Colin Watson ]
+   * apt-pkg/cdrom.cc:
+     - fix off-by-one error in DropBinaryArch
+ 
+   [ Julian Andres Klode ]
+   * apt-pkg/contrib/fileutl.cc:
+     - Add WriteAtomic mode.
+     - Revert WriteEmpty to old behavior (LP: #613211)
+   * apt-pkg, methods:
+     - Convert users of WriteEmpty to WriteAtomic.
+   * apt-pkg/depcache.cc:
+     - Only try upgrade for Breaks if there is a newer version, otherwise
+       handle it as Conflicts (by removing it) (helps for #591882).
+   * debian/control:
+     - Add dependency on gnupg to apt, apt-key uses it.
  
 - -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 30 Jul 2010 17:37:14 +0200
 +  [ David Kalnischkies ]
 +  * apt-pkg/algorithms.cc:
 +    - change the debug outputs to display also arch of the
 +      package and version dependencies information
 +
 + -- David Kalnischkies <kalnischkies@gmail.com>  Tue, 10 Aug 2010 15:56:11 +0200
  
  apt (0.7.26~exp12) experimental; urgency=low