Merge changes from Hoary (0.5.30,0.5.30ubuntu2]

Patches applied:

 * michael.vogt@canonical.com--2004/apt--mvo--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-14

 * michael.vogt@canonical.com--2004/apt--mvo--0--patch-1
   * imported the changes from 0.5.30 to 0.5.30ubuntu2

diff --cc debian/changelog
index 606c119e4bd8e24eb029872e1f54d32048163b65,a971e30b121179d925f46041b09d2b0004c4733c..f9c615373260b8848522851fb8ce2ae665a4bb8f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,24 @@@
 +apt (0.5.31) unstable; urgency=low
 +
 +  * New Romanian translation from Sorin Batariuc <sorin@bonbon.net>
 +    (Closes: #281458)
++  * Merge changes from Hoary (0.5.30,0.5.30ubuntu2]
 +
 + --
 +
+ apt (0.5.30ubuntu2) hoary; urgency=low
+ 
+   * bzip2 is now "Suggested" and it will detect if bzip2 is installed 
+     and only then trying to get Packages.bz2
+ 
+  -- Michael Vogt <mvo@debian.org>  Fri, 19 Nov 2004 12:00:39 +0100
+ 
+ apt (0.5.30ubuntu1) hoary; urgency=low
+ 
+   * Need to Depend: bzip2 or Packages.bz2 fail.
+ 
+  -- LaMont Jones <lamont@canonical.com>  Thu, 18 Nov 2004 12:51:05 -0700
+ 
  apt (0.5.30) hoary; urgency=low
  
    * Patch from Michael Vogt to enable Packages.bz2 use, with a fallback to