Merge branch 'master' into next

* master:
Add git-quiltimport to .gitignore.
cvsimport: introduce _fetchfile() method and used a 1M buffer to read()
cvsimport: cleanup commit function
cvsimport: use git-update-index --index-info
git status: skip empty directories, and add -u to show all untracked files
cvsimport: repack every kilo-commits.
cvsimport: introduce -L<imit> option to workaround memory leaks

diff --combined .gitignore
index 7906909b306f80ed74d6e53bb8514a889057194c,199cc310a25281a1b423be9399fb9633f0d0c066..18a7295e6ca864e416a02dc12d7dff4cd9b9748d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -77,6 -77,7 +77,7 @@@ git-prun
  git-prune-packed
  git-pull
  git-push
+ git-quiltimport
  git-read-tree
  git-rebase
  git-receive-pack
@@@ -123,7 -124,6 +124,7 @@@ git-write-tre
  git-core-*/?*
  test-date
  test-delta
 +test-dump-cache-tree
  common-cmds.h
  *.tar.gz
  *.dsc