* ftparchive/writer.cc:

  - null the valid string instead of the date if Valid-Until is not set
* apt-pkg/acquire-item.cc:
  - use also unsigned Release files again (Closes: #596189)

diff --cc debian/changelog
index 4fdf13ccc2dd478cc9ed370e777b891dda884505,1780714b8a9b8e7c2ac2d7d3c36ea6b3a2e14acb..7b126b6619301340c93fccaf585c8eb78c7174e1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,17 @@@
  apt (0.8.4) UNRELEASED; urgency=low
  
 - -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 09 Sep 2010 18:21:51 +0200
++  [ Michael vogt ]
 +  * ftparchive/writer.cc:
 +    - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
 +      available LP: #633967. Thanks to Colin Watson
 +
+   [ David Kalnischkies ]
+   * ftparchive/writer.cc:
+     - null the valid string instead of the date if Valid-Until is not set
+   * apt-pkg/acquire-item.cc:
+     - use also unsigned Release files again (Closes: #596189)
+ 
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 09 Sep 2010 15:30:19 +0200
  
  apt (0.8.3) unstable; urgency=low
  

diff --cc ftparchive/writer.cc
Simple merge