* merged from mainline

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

diff --cc debian/changelog
index c4bcf5c1c3fffe62a420bcc8ab84405974418964,66b5df264651be811f1feea293dfc26ffd8b992a..3d60c1b27cb02689f01f93d4287a0e564016654f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,13 +1,15 @@@
+ apt (0.6.44.1-0.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Don't give an error when parsing empty Packages/Sources files.
+     (Closes: #366931, #367086, #370160)
+ 
+  -- Steinar H. Gunderson <sesse@debian.org>  Fri,  9 Jun 2006 00:52:21 +0200
+ 
  apt (0.6.44.1) unstable; urgency=low
  
 +  * apt-pkg/acquire-item.cc:
 +    - fix reversed logic of the "Acquire::PDiffs" option
    * merged from 
      http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main:
      - po/LINGUAS: added "bg" Closes: #360262

diff --cc doc/examples/configure-index
Simple merge