* merged with mainline
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 22 Feb 2006 09:22:23 +0000 (09:22 +0000)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 22 Feb 2006 09:22:23 +0000 (09:22 +0000)
Patches applied:

 * mvo@debian.org--2005/apt--debian-sid--0--patch-19
   * synced with mainline

 * mvo@debian.org--2005/apt--debian-sid--0--patch-20
   * merged with mainline, finalized changelog


Trivial merge