* merged fixes from the debian-sid bzr branch:

* Thai (Theppitak Karoonboonyanan). Closes: #592695
* Russian (Yuri Kozlov). Closes: #594232
* Slovak (Ivan Masár). Closes: #594255
* Swedish (Daniel Nylander). Closes: #594241
* Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
* Italian (Milo Casagrande). Closes: #594238
* Asturian (maacub). Closes: #594303
* Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
  Closes: #594211
* show in madison command again also source packages (LP: #614589)

diff --cc debian/changelog
index cc358eaf6a0ce24e7783246c3c9e8d3727a51ac6,41ec1b2a15cebad8fd71ee564fa685a0694b1900..f9fbc43cc51c142249c12e923cd15ada7808402e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,22 +1,30 @@@
 -apt (0.8.1) UNRELEASED; urgency=low
++apt (0.8.0ubuntu2) maverick; urgency=low
+ 
++  * merged fixes from the debian-sid bzr branch:
++  
+   [ Programs translations ]
+   * Thai (Theppitak Karoonboonyanan). Closes: #592695
+   * Russian (Yuri Kozlov). Closes: #594232
+   * Slovak (Ivan Masár). Closes: #594255
+   * Swedish (Daniel Nylander). Closes: #594241
+   * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
+   * Italian (Milo Casagrande). Closes: #594238
+   * Asturian (maacub). Closes: #594303
+ 
+   [ Christian Perrier ]
+   * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
+     Closes: #594211
+ 
+   [ David Kalnischkies ]
+   * show in madison command again also source packages (LP: #614589)
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 25 Aug 2010 17:46:48 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 26 Aug 2010 18:56:23 +0200
++
 +apt (0.8.0ubuntu1) maverick; urgency=low
 +
 +  * merged from debian/unstable
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 24 Aug 2010 21:39:06 +0200
  
  apt (0.8.0) unstable; urgency=low