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: (297 commits)
  GIT 1.6.1-rc1
  Include git-gui--askpass in git-gui RPM package
  send-email: do not reverse the command line arguments
  Update draft release notes to 1.6.0.5
  generate-cmdlist.sh: avoid selecting synopsis at wrong place
  sha1_file.c: resolve confusion EACCES vs EPERM
  sha1_file: avoid bogus "file exists" error message
  git checkout: don't warn about unborn branch if -f is already passed
  bash: offer refs instead of filenames for 'git revert'
  bash: complete full refs
  bash: remove dashed command leftovers
  git-p4: fix keyword-expansion regex
  Fix typos in the documentation.
  Fix typos in the documentation.
  git-gui: update Japanese translation
  config.txt: alphabetize configuration sections
  xdiff-interface.c: remove 10 duplicated lines
  t9129-git-svn-i18n-commitencoding: Make compare_svn_head_with() compatible with OSX sed
  Teach "git diff" to honour --[no-]ext-diff
  send-email: Fix Pine address book parsing
  ...

Conflicts:
	Documentation/gitattributes.txt