Merge branch 'maint' to sync with GIT 1.5.2.2

diff --cc .gitignore
index bd49cd4627a786d6dbcd7f0d17f0fddc2add7014,b7546a5591c7e70f8b0b87f528215cbfdf878da1..e8b060cbe43d13b82ad8686f7676a26ef559a609
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -157,9 -156,9 +157,9 @@@ common-cmds.
  *.tar.gz
  *.dsc
  *.deb
- git-core.spec
+ git.spec
  *.exe
 -*.[ao]
 +*.[aos]
  *.py[co]
  config.mak
  autom4te.cache

diff --cc Documentation/asciidoc.conf
Simple merge

diff --cc Documentation/git-cvsexportcommit.txt
index 827711c3c9b8ad8c7ecb074c5ec1a9b887992526,f3590dee04f801f79cf6400a30a0d9c6f4169154..6c423e3a2f1c69e523eeb9cc092126adc2691803
--- 1/Documentation/git-cvsexportcommit.txt
--- 2/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@@ -73,10 -70,10 +73,10 @@@ Merge one patch into CVS:
  $ export GIT_DIR=~/project/.git
  $ cd ~/project_cvs_checkout
  $ git-cvsexportcommit -v <commit-sha1>
 -$ cvs commit -F .mgs <files> 
 +$ cvs commit -F .mgs <files>
  ------------
  
- Merge pending patches into CVS automatically -- only if you really know what you are doing ::
+ Merge pending patches into CVS automatically -- only if you really know what you are doing::
  +
  ------------
  $ export GIT_DIR=~/project/.git

diff --cc Documentation/user-manual.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc revision.c
Simple merge