Merge branch 'maint'

* maint:
GIT 1.6.0.4
Update RPM spec for the new location of git-cvsserver.
push: fix local refs update if already up-to-date
do not force write of packed refs

Conflicts:
builtin-revert.c

diff --cc builtin-send-pack.c
Simple merge

diff --cc refs.c
Simple merge