Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (45 commits)
  cvsimport: cleanup temporary cvsps file
  cvsimport: document -S and -L options
  cvsimport: skip commits that are too recent (option and documentation)
  git-svn: pass an unambiguous ref to rev-list when grafting-branches
  git-svn: add --prefix= option to multi-init
  Documentation: clarify definition of "reachable"
  git-svnimport: fix edge revisions double importing
  cvsimport: skip commits that are too recent
  gitweb: Remove superfluous "|" in "commit" view
  Remove unnecessary git-rm --cached reference from status output
  "init-db" can really be just "init"
  Spell default packedgitlimit slightly differently
  git-reset <tree> -- <path> restores absense of <path> in <tree>
  diff-index --cached --raw: show tree entry on the LHS for unmerged entries.
  Increase packedGit{Limit,WindowSize} on 64 bit systems.
  git-remote
  Improve cached content header of status output
  Support --amend on initial commit in status output
  Improve "nothing to commit" part of status output
  Clarify syntax and role of git-add in status output
  ...