]> git.saurik.com Git - apt.git/commitdiff
Merge with Michael and resolve conflicts
authorbubulle@debian.org <>
Mon, 21 Aug 2006 15:55:15 +0000 (10:55 -0500)
committerbubulle@debian.org <>
Mon, 21 Aug 2006 15:55:15 +0000 (10:55 -0500)

Trivial merge