* merged with mvo

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105
   * fix mailaddress

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106
   * fix a string (thanks to bubulle)

apt-pkg/sourcelist.cc

@@ -241,7 +241,7 @@ bool pkgSourceList::ReadAppend(string File)
 
       Type *Parse = Type::GetType(LineType.c_str());
       if (Parse == 0)
-	 return _error->Error(_("Type '%s' is not known in on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
+	 return _error->Error(_("Type '%s' is not known on line %u in source list %s"),LineType.c_str(),CurLine,File.c_str());
       
       // Vendor name specified
       if (C[0] == '[')

debian/changelog

@@ -16,7 +16,7 @@ apt (0.6.43) unstable; urgency=medium
   * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
   * switch to libdb4.3 in build-depends
   
- -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 25 Nov 2005 11:22:31 +0100
+ -- Michael Vogt <mvo@debian.org>  Tue, 29 Nov 2005 00:17:07 +0100
 
 apt (0.6.42.3) unstable; urgency=low