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: (113 commits)
  t3700-add: add a POSIXPERM prerequisite to a new test
  GIT 1.6.3.3
  attribute: whitespace set to true detects all errors known to git
  .gitattributes: CR at the end of the line is an error
  t3505: fix abuse of test_expect_code
  git-show-ref.txt: remove word and make consistent
  Fix various sparse warnings in the git source code
  git-svn documentation: fix typo in 'rebase vs. pull/merge' section
  add: allow configurations to be overriden by command line
  Add -k option to cvsexportcommit to revert expanded CVS keywords in CVS working tree before applying commit patch
  http.c: fix compiling with libcurl 7.9.2
  Test cccmd in t9001-send-email.sh and fix some bugs
  import-tars: support symlinks
  upload-archive: fix infinite loop on Cygwin
  avoid exponential regex match for java and objc function names
  Fix big left-shifts of unsigned char
  pull, rebase: simplify to use die()
  use xstrdup, not strdup in ll-merge.c
  avoid NULL dereference on failed malloc
  git-rerere.txt: grammatical fixups and cleanups
  ...