merge with lp:~mvo/apt/debian-sid

diff --cc debian/changelog
index 6b4b4147836d266443413244fa30ec20d100496e,48768ad88fded688ae3e7134588d698574aa48e9..b5cedbe2ef83b04a48cb6ab7f57fd62554d9ace5
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -18,29 -18,15 +18,34 @@@ apt (0.7.24) UNRELEASED; urgency=lo
      - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9
    * buildlib/po4a_manpage.mak, doc/makefile, configure:
      - simplify the makefiles needed for po4a manpages
 +  * apt-pkg/contrib/configuration.cc:
 +    - add a helper to easily get a vector of strings from the config
 +  * apt-pkg/contrib/strutl.cc:
 +    - replace unknown multibytes with ? in UTF8ToCharset (Closes: #545208)
 +  * doc/apt-get.8.xml:
 +    - fix two little typos in the --simulate description.
 +  * apt-pkg/aptconfiguration.cc, doc/apt.conf.5.xml:
 +    - add an order subgroup to the compression types to simplify reordering
 +      a bit and improve the documentation for this option group.
 +  * doc/apt.ent, all man pages:
 +    - move the description of files to globally usable entities
 +  * doc/apt_preferences.5.xml:
 +    - document the new preferences.d folder (Closes: #544017)
 +  * methods/rred.cc:
 +    - add at the top without failing (by Bernhard R. Link, Closes: #545694)
 +  * buildlib/sizetable:
 +    - add amd64 for cross building (by Mikhail Gusarov, Closes: #513058)
 +  * debian/prerm:
 +    - remove file as nobody will upgrade from 0.4.10 anymore
  
+   [ Christian Perrier ]
+   * doc/fr/*, doc/po/fr.po:
+     - remove the old fr man page translation and replace it with
+       the new po4a-powered translation
+ 
   -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
  
- apt (0.7.23.1) UNRELEASED; urgency=low
+ apt (0.7.23.1) unstable; urgency=low
  
    [ Michael Vogt ]
    * apt-pkg/pkgcache.cc: