Fix merge and build issue.

git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_hyracks_result_distribution@3172 123451ca-8445-de46-9d55-352943316053
1 file changed