Merge with Michael

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62
   * leak fix for debian #250583

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-63
   * changelog update

apt-pkg/contrib/mmap.cc

@@ -155,9 +155,9 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace)
    unsigned long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
-   else
+   else if(WorkSpace > 0)
    {
-      Fd->Seek(WorkSpace);
+      Fd->Seek(WorkSpace - 1);
       char C = 0;
       Fd->Write(&C,sizeof(C));
    }

debian/changelog

@@ -9,7 +9,10 @@ apt (0.6.41.1) unstable; urgency=low
     - patch-99: Added Galician translation
     - patch-100: Completed Danish translation (Closes: #325686)
     - patch-104: French translation completed
-  * applied frensh man-page update (thanks to Philippe Batailler)
+  * applied french man-page update (thanks to Philippe Batailler)
+    (closes: #316318, #327456)
+  * fix leak in the mmap code, thanks to Daniel Burrows for the
+    patch (closes: #250583)
   
  --