Merge master branch changes into release candidate branch.

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

diff --combined Makefile
index bc2f389a2dd83277b26462cba69ce24c6462b6d5,c0fdaa701f973ec84a9c4524af451432ee2adcf0..57d4f1170c06bfff42cb64a753741fd4fa6fa37c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -32,7 -32,7 +32,7 @@@
  
  # DEFINES += -DUSE_STDEV
  
 -GIT_VERSION = 0.99.5
 +GIT_VERSION = 0.99.6
  
  CFLAGS = -g -O2 -Wall
  ALL_CFLAGS = $(CFLAGS) $(DEFINES)
@@@ -69,7 -69,6 +69,6 @@@ SCRIPTS=git git-apply-patch-script git-
        git-request-pull-script git-bisect-script
  
  SCRIPTS += git-count-objects-script
- # SCRIPTS += git-send-email-script
  SCRIPTS += git-revert-script
  SCRIPTS += git-octopus-script
  
@@@ -87,6 -86,10 +86,10 @@@ PROG=   git-update-cache git-diff-file
        git-show-index git-daemon git-var git-peek-remote git-show-branch \
        git-update-server-info git-show-rev-cache git-build-rev-cache
  
+ ifdef WITH_SEND_EMAIL
+ SCRIPTS += git-send-email-script
+ endif
+ 
  ifndef NO_CURL
        PROG+= git-http-pull
  endif

diff --combined 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