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: (43 commits)
  Update draft release notes to 1.6.1
  git-am: rename apply_opt_extra file to apply-opt
  Test that git-am does not lose -C/-p/--whitespace options
  git-am: propagate --3way options as well
  git-am: propagate -C<n>, -p<n> options as well
  git-am --whitespace: do not lose the command line option
  git-p4: Fix bug in p4Where method.
  Report symlink failures in merge-recursive
  Make chdir failures visible
  Make some of fwrite/fclose/write/close failures visible
  add stage to gitignore
  submodule: use git rev-parse -q
  rebase: use git rev-parse -q
  pull: use git rev-parse -q
  lost-found: use git rev-parse -q
  filter-branch: use git rev-parse -q
  git-svn: Make branch use correct svn-remote
  Install git-stage in exec-path
  xdiff: give up scanning similar lines early
  gitweb: Fix handling of non-ASCII characters in inserted HTML files
  ...