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

.gitignore

bindings/java/build-unix.xml

bindings/java/build-windows.xml

bindings/java/build.xml

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

bindings/java/test/README.txt

bindings/java/test/org/sleuthkit/datamodel/BottomUpTest.java

...s/java/test/org/sleuthkit/datamodel/CPPtoJavaCompare.java

...java/test/org/sleuthkit/datamodel/DataModelTestSuite.java

bindings/java/test/org/sleuthkit/datamodel/ImgTraverser.java

...ava/test/org/sleuthkit/datamodel/SequentialTraversal.java

...s/java/test/org/sleuthkit/datamodel/TopDownTraversal.java

bindings/java/test/output/gold/nps-2009-canon2-gen6_BU.txt

bindings/java/test/output/gold/nps-2009-canon2-gen6_CPP.txt

...gs/java/test/output/gold/nps-2009-canon2-gen6_CPP_Exc.txt

...gs/java/test/output/gold/nps-2009-canon2-gen6_CPP_SRT.txt

...gs/java/test/output/gold/nps-2009-canon2-gen6_Seq_Exc.txt

...ngs/java/test/output/gold/nps-2009-canon2-gen6_TD_Exc.txt

bindings/java/test/output/gold/ntfs1-gen2_BU.txt

bindings/java/test/output/gold/ntfs1-gen2_CPP.txt