Sync with 1.6.0.2

diff --cc Documentation/gitattributes.txt
index 75124d26125f736b446b8e18826af3e444503edd,94e6752aa2e78e4bcf69334ca92bc41439b33028..6f3551dc825a04628e7bcd133421093d89f01956
--- 1/Documentation/gitattributes.txt
--- 2/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@@ -311,9 -311,7 +311,9 @@@ patterns are available
  
  - `bibtex` suitable for files with BibTeX coded references.
  
- - `java` suitable for source code in the Java lanugage.
 +- `html` suitable for HTML/XHTML documents.
 +
+ - `java` suitable for source code in the Java language.
  
  - `pascal` suitable for source code in the Pascal/Delphi language.
  

diff --cc Makefile
index 247cd2dc3098e088a06d7f7670b4e48dc5e686ee,8d81095765b1e73fa79e2950c47fd06f3c475ac7..3c0664a0734a156859ea204ae4b9b5979620c28c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -687,7 -677,8 +687,9 @@@ ifeq ($(uname_S),FreeBSD
        BASIC_CFLAGS += -I/usr/local/include
        BASIC_LDFLAGS += -L/usr/local/lib
        DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
 +      THREADED_DELTA_SEARCH = YesPlease
+       COMPAT_CFLAGS += -Icompat/regex
+       COMPAT_OBJS += compat/regex/regex.o
  endif
  ifeq ($(uname_S),OpenBSD)
        NO_STRCASESTR = YesPlease