* merged from apt--mvo

diff --combined debian/changelog
index a80816038cc2e8bec50032822e6937a424545b63,11cdd22cd68ffa64b7375b7d67b29376767f2266..3c8a4e538f1301d5771cdf423115b185314559ac
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,13 +1,13 @@@
  apt (0.7.4) UNRELEASED; urgency=low
  
-   [Michael Vogt]
+   [ Michael Vogt ]
    * cmdline/apt-get.cc:
      - fix in the task-install code regexp (thanks to Adam Conrad and
        Colin Watson)
      - support task removal too: apt-get remove taskname^
        (thanks to Matt Zimmerman reporting this problem)
-   * merged from Christian Perrier (thanks!)
-     * eu.po: completed to 532t. Closes: #423766
-     * Update all PO and the POT. Gives 529t3f for formerly
-       complete translations
-     * Unfuzzy formerly complete translations (es, fr, gl, vi)
-     * es.po: completed to 532t, again. Closes: #429935
-     * vi.po: completed to 532t, again. Closes: #429899
  
-   [Otavio Salvador]
+   [ Otavio Salvador ]
    * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)
    * Fix compilation warnings:
      - apt-pkg/contrib/configuration.cc: wrong argument type;
@@@ -31,8 -24,16 +24,16 @@@
    * Fix example for Install-{Recommends,Suggests} options on
      configure-index example file. Thanks to Peter Eisentraut
      <peter_e@gmx.net> by the patch (closes: #432223)
+   
+   [ Christian Perrier ]
+   * Basque translation update. Closes: ##423766
+   * Unfuzzy formerly complete translations
+   * French translation update
+   * Re-generate PO(T) files
+   * Spanish translation update
+   * Swedish translation update
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 11 Jul 2007 23:20:15 +0100
+  -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 14 Jul 2007 15:52:15 -0300
  
  apt (0.7.3) unstable; urgency=low
  
@@@ -46,9 -47,9 +47,9 @@@
      - fix InstallTask code when a pkgRecord ends 
        with a single '\n' (thanks to Soren Hansen for reporting)
    * merged from Christian Perrier:
 -      * vi.po: completed to 532t, again. Closes: #429899
 -      * gl.po: completed to 532t. Closes: #429506
 -      * vi.po: completed to 532t. Closes: #428672
 +        * vi.po: completed to 532t, again. Closes: #429899
 +        * gl.po: completed to 532t. Closes: #429506
 +        * vi.po: completed to 532t. Closes: #428672
          * Update all PO and the POT. Gives 514t14f4u for formerly
            complete translations
          * fr.po: completed to 532t
@@@ -2571,4 -2572,3 +2572,3 @@@ apt (0.0.1) unstable; urgency=lo
    * Initial Release.
  
   -- Scott K. Ellis <scott@debian.org>  Tue, 31 Mar 1998 12:49:28 -0500
-