Merge 1.5.1.5 in

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

diff --cc Documentation/git-rev-list.txt
Simple merge

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