Merge with Michael
authorChristian Perrier <bubulle@debian.org>
Tue, 18 Oct 2005 18:39:44 +0000 (18:39 +0000)
committerChristian Perrier <bubulle@debian.org>
Tue, 18 Oct 2005 18:39:44 +0000 (18:39 +0000)
Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-64
   * merged with bubulle


Trivial merge