Merge branch 'master' of github.com:sleuthkit/sleuthkit

Makefile.am

bindings/java/Makefile.am

bindings/java/build-unix.xml

bindings/java/build-windows.xml

bindings/java/build.xml

bindings/java/src/org/sleuthkit/datamodel/AbstractFile.java

bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java

bindings/java/src/org/sleuthkit/datamodel/SleuthkitJNI.java

bindings/java/src/org/sleuthkit/datamodel/TskData.java

configure.ac

m4/ac_prog_java.m4

m4/ac_prog_java_works.m4

tsk/auto/db_sqlite.cpp

tsk/auto/tsk_db_sqlite.h

tsk/fs/hfs.c

tsk/img/ewf.c

tsk/tsk_config.h.in