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
Cleanup of some recently added attributes.
Merge branch 'master' of https://github.com/sleuthkit/sleuthkit

Conflicts:
	bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java
	framework/tsk/framework/services/TskBlackboard.cpp
	framework/tsk/framework/services/TskBlackboard.h
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