Checking in code for the night.
Merge branch 'mergeCloudFilesDao' into hadoop-1.0.3