Merge master branch changes into release candidate branch.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --cc Makefile
Simple merge

diff --cc debian/changelog
index 0c87797e8353036b5eac8da3fe13f0bcfeaf060c,5b7b4d3ff3e3fb228588c320c52f07a8e0a0cd91..f3cf358fb111a4d7696f4fc117e43bb79e89c08e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +git-core (0.99.6-0) unstable; urgency=low
 +
 +  * GIT 0.99.6
 +
 + -- Junio C Hamano <junkio@cox.net>  Wed, 24 Aug 2005 23:09:35 -0700
 +
+ git-core (0.99.5-1) unstable; urgency=low
+ 
+   * Enable git-send-email-script on Debian.  There is no reason to shy
+     away from it, since we have the necessary Perl modules available.
+ 
+  -- Junio C Hamano <junkio@cox.net>  Thu, 25 Aug 2005 14:16:59 -0700
+ 
  git-core (0.99.5-0) unstable; urgency=low
  
    * GIT 0.99.5