Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (34 commits)
cvsserver: Add test cases for git-cvsserver
Update documentation links to point at 1.5.1.4
Increase pack.depth default to 50
Add pack.depth option to git-pack-objects.
Use .git/MERGE_MSG in cherry-pick/revert
GIT v1.5.1.4
Add howto files to rpm packages.
wcwidth redeclaration
user-manual: fix clone and fetch typos
Remove duplicate exports from Makefile
git-gui: Use vi-like keys in merge dialog
git-gui: Include commit id/subject in merge choices
git-gui: Show all possible branches for merge
git-gui: Move merge support into a namespace
git-gui: Allow vi keys to scroll the diff/blame regions
git-gui: Move console procs into their own namespace
git-gui: Refactor into multiple files to save my sanity
gitweb: Show combined diff for merge commits in 'commit' view
gitweb: Show combined diff for merge commits in 'commitdiff' view
gitweb: Make it possible to use pre-parsed info in git_difftree_body
...