Merge branch 'jc/boundary' into next

* jc/boundary:
  rev-list --boundary: show boundary commits even when limited otherwise.
  Makefile fixups.
  gitk: Fix bug caused by missing commitlisted elements

diff --cc Makefile
index 69ca05b,8371f7f..84a4b84
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -656,8 -653,7 +656,8 @@@ rpm: dis
  clean:
        rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o xdiff/*.o \
                $(LIB_FILE) $(XDIFF_LIB)
-       rm -f $(ALL_PROGRAMS) git$X
+       rm -f $(ALL_PROGRAMS) $(BUILT_INS) git$X
 +      rm -f test-date$X test-delta$X test-gsimm$X
        rm -f *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h TAGS tags
        rm -rf $(GIT_TARNAME)
        rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz

diff --cc http-push.c
Simple merge

diff --cc rev-list.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc revision.h
Simple merge