merged from debian-sid

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index 59a88ca21a34a58358b57a88412ea7a1bec4f3f4,3d5db5f48c7c06846f57d06805a76ca71b89aae8..d39bf3d2f1fb47db0c3add921e2ed0ca12c1fbd9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,52 +1,60 @@@
- apt (0.7.22) unstable; urgency=low
++apt (0.7.23) unstable; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - honor APT::Get::Only-Source properly in FindSrc() (thanks to
 +      Martin Pitt for reporting the problem)
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 30 Jul 2009 15:27:30 +0200
 +
- apt (0.7.21) UNRELEASED; urgency=low
+ apt (0.7.22) unstable; urgency=low
  
-   [ Osamu Aoki ]
-   * Updated cron script to support backups by hardlinks and 
-     verbose levels.  All features turned off by default. 
-   * Added more error handlings.  Closes: #438803, #462734, #454989, 
-   * Documented all cron script related configuration items in 
-     configure-index.
+   [ Christian Perrier ]
+   * Documentation translations:
+     - Fix a typo in apt-get(8) French translation. Closes: #525043
+       Thanks to Guillaume Delacour for spotting it.
+     - Updated apt.conf(5) manpgae French translation.
+       Thanks to Aurélien Couderc.
+   * Translations:
+     - fr.po
+     - sk.po. Closes: #525857 
+     - ru.po. Closes: #526816
+     - eu.po. Closes: #528985
+     - zh_CN.po. Closes: #531390
+     - fr.po
+     - it.po. Closes: #531758
+     - ca.po. Closes: #531921
+     - de.po. Closes: #536430
+   * Added translations
+     - ast.po (Asturian by Marcos Alvareez Costales).
+       Closes: #529007, #529730, #535328
+   
+   [ David Kalnischkies ]
+   * [ABI break] support '#' in apt.conf and /etc/apt/preferences
+     (closes: #189866)
+   * [ABI break] Allow pinning by codename (closes: #97564)
+   * support running "--simulate" as user
+   * add depth information to the debug output and show what depends
+     type triggers a autoinst (closes: #458389)
+   * add Debug::pkgDepCache::Marker with more detailed debug output 
+     (closes: #87520)
+   * add Debug::pkgProblemResolver::ShowScores and make the scores
+     adjustable
+   * do not write state file in simulate mode (closes: #433007)
+   * add hook for MarkInstall and MarkDelete (closes: #470035)
+   * fix typo in apt-pkg/acquire.cc which prevents Dl-Limit to work
+     correctly when downloading from multiple sites (Closes: #534752)
+   * add the various foldmarkers in apt-pkg & cmdline (no code change)
+   * versions with a pin of -1 shouldn't be a candidate (Closes: #355237)
+   * prefer mmap as memory allocator in MMap instead of a static char
+     array which can (at least in theory) grow dynamic
+   * eliminate (hopefully all) segfaults in pkgcachegen.cc and mmap.cc
+     which can arise if cache doesn't fit into the mmap (Closes: #535218)
+   * display warnings instead of errors if the parts dirs doesn't exist
  
    [ Michael Vogt ]
+   * honor the dpkg hold state in new Marker hooks (closes: #64141)
+   * debian/apt.cron.daily:
+     - if the timestamp is too far in the future, delete it
    * apt-pkg/acquire.cc:
      - make the max pipeline depth of the acquire queue configurable
        via Acquire::Max-Pipeline-Depth