merge
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fix string termination in addFile()
Merge branch 'master' of https://github.com/adam-m/sleuthkit
correct time to string conversion macros in addFile() to make more cross-platform (possible crash fix on linux)
Merge pull request #169 from adam-m/master

addFile() fixes
Merge http://www.github.com/sleuthkit/sleuthkit
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/Smoss/sleuthkit
java bindings: fix find by hash query to be a string query
Merge pull request #170 from adam-m/master

Fix bug in file query by md5
Merge http://www.github.com/sleuthkit/sleuthkit
java bindings: add public close() support to Content objects.  Make synchronization when dealing with handles more granular.
add file to log msg
update news
minor test fixes
Merge pull request #171 from adam-m/master

add public close() support to Content
Removed tsk_incs.h from make clean target
Fixed Data Model tests