Replaced file deletion method to be jdk6 compatible.
Merge https://github.com/jawallace/sleuthkit
Added updated build files for building datamodel with native libs on mac.
Merge https://github.com/sleuthkit/sleuthkit

Conflicts (line endings again):
	bindings/java/build.xml
	bindings/java/src/org/sleuthkit/datamodel/LibraryUtils.java
Fixed merge error
Merge pull request #209 from raman-bt/master

Cleanup of recently added attributes.
Merge pull request #208 from jawallace/master

Mac OS X Datamodel
Fixed library loading error in LibraryUtils
Removed stray println
Merge pull request #210 from jawallace/master

Error in previous pull request.
Applied fix that takes sequence number into account when looking up parent.
Merge branch 'master' of github.com:sleuthkit/sleuthkit
Move xmlns declarations to root element

The XML namespace declarations in Fiwalk have been at the wrong point
in the XML tree.  Being where they were, only one or two elements would
get any namespace assigned to them.

Applying this patch, the output of Fiwalk is now valid DFXML according
to the (draft) XML Schema at:
<https://github.com/dfxml-working-group/dfxml_schema/blob/v1.1.0rfc0/dfxml.xsd>

After some discussion with the DFXML Working Group, it will be
appropriate to bump the /dfxml/@version attribute to "1.1.0" to indicate
support of an official DFXML Schema version; however, the current
schema version is a Request for Comments.  Input on the schema is
welcome.

Signed-off-by: Alex Nelson <a.nelson@prometheuscomputing.com>
Update ewf.c

using free() to deallocate memory allocated by tsk_img_malloc() causes critical section leak, because tsk_deinit_lock(&(imgInfo->cache_lock)); is never called. I suggest to replace free() by tsk_img_free() where necessary.
moved vs_close to after it is done being used.  patch from Joachim Metz
Merge branch 'master' of github.com:sleuthkit/sleuthkit
Fixed mmls to how it was before.  it was correct.
mmls fix again, correct this time...
Merge pull request #212 from ajnelson/adjust_fiwalk_dfxml

Move xmlns declarations to root element
added Transaction class to encapsulate db transactions.  changed SleuthkitCase to use the Transactions rather than having each method manage the database lock and autocommit settings.  to preserve the old interface,  for methods that take a transaction parameter, i added wrapper methods  that don't take a transaction but instead create one locally and use the new transaction based methods.