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: (95 commits)
  Git 1.7.1-rc1
  Teach diff --submodule and status to handle .git files in submodules
  Let check_preimage() use memset() to initialize "struct checkout"
  fetch/push: fix usage strings
  branch: say "Reset to" in reflog entries for 'git branch -f' operations
  diff.c: work around pointer constness warnings
  docs: clarify "branch -l"
  fix typos and grammar in 1.7.1 draft release notes
  notes.h: declare bit field as unsigned to silence compiler complaints
  Git 1.7.1-rc0
  Revert "Link against libiconv on IRIX"
  pack-protocol.txt: fix pkt-line lengths
  pack-protocol.txt: fix spelling
  Teach mailinfo %< as an alternative scissors mark
  Makefile: future-proof Cygwin version check
  Fix _XOPEN_SOURCE problem on DragonFly
  gitweb: update INSTALL to use shorter make target
  gitweb: add documentation to INSTALL regarding gitweb.js
  instaweb: add minification awareness
  Gitweb: add autoconfigure support for minifiers
  ...