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)
commit3708af292b7c6a5a3b08f1acad8e4651fab588a9
tree13ac24afa193a8c088d2b1a0e1e2770485e00679
parente9d07db9c6c8efa491b5d53229ae7139f7dc0a58
parent293f9419549a6247b81ee4afa31e62e230d613ed
Merge with Michael

Patches applied:

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