Merge fixes up to GIT 1.0.4

diff --cc debian/changelog
index 8d6c0667c7dc9c8ef92ba494d0ddc625e0f01260,88e5755f79edaee45687fbacf1b9fb06fb44e5e7..d7f75910798c14e21107c26c97f76292fb3c62a9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,21 @@@
 +git-core (1.0.GIT-0) unstable; urgency=low
 +
 +  * Post GIT 1.0 development track.
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 22:28:33 -0800
 +
 +git-core (1.0.0.GIT-0) unstable; urgency=low
 +
 +  * Post GIT 1.0.0 development track.
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 21 Dec 2005 12:12:05 -0800
 +
+ git-core (1.0.4-0) unstable; urgency=low
+ 
+   * GIT 1.0.4.
+ 
+  -- Junio C Hamano <junkio@cox.net>  Sat, 24 Dec 2005 00:01:20 -0800
+ 
  git-core (1.0.3-0) unstable; urgency=low
  
    * GIT 1.0.3 maintenance release.