Merge branch 'master' into next

* master:
GIT 1.3.0
Add git-annotate(1) and git-blame(1)
diff --stat: make sure to set recursive.
git-svnimport symlink support

diff --cc Makefile
Simple merge