merge train fixes

diff --cc debian/changelog
index 46213d779feb7d54e6382c2d627f7676fb398a8e,d08dd8038369faa816a20583ef1ca8e3c3ca43c1..840d9ebd9bf85e807b8465da7027aebe4299a0d4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -6,8 -6,17 +6,17 @@@ apt (0.9.7.8) UNRELEASED; urgency=lo
    [ Michael Vogt ]
    * fix pkgProblemResolver::Scores, thanks to Paul Wise. 
      Closes: #697577
 -  * add missing translated apt.8 manpages, thanks to Helge Kreutzmann.
 -    Closes: #696923
 +  * fix missing translated apt.8 manpages, thanks to Helge Kreutzmann
 +    for the report. Closes: #696923
+   * apt-pkg/contrib/progress.cc:
+     - Make "..." translatable to fix inconsistencies in the output
+       of e.g. apt-get update. While this adds new translatable strings,
+       not having translations for them will not break anything.
+       Thanks to Guillem Jover. Closes: #696225
+   * debian/apt.cron.daily:
+     - when reading from /dev/urandom, use less entropy and fix a rare
+       bug when the random number chksum is less than 1000.
+       Closes: #695285
  
   -- Christian Perrier <bubulle@debian.org>  Mon, 24 Dec 2012 07:01:20 +0100