Merge branch 'maint'

* maint:
GIT 1.6.2.3
State the effect of filter-branch on graft explicitly
process_{tree,blob}: Remove useless xstrdup calls

Conflicts:
GIT-VERSION-GEN

diff --cc Documentation/git-filter-branch.txt
Simple merge

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