Merge pull request #14 from jhartlaub/shark-0.9-csd

Applied patch https://issues.apache.org/jira/browse/HIVE-2332