tree 9bd1f80c8fa8e2ceee5cc1443d3c67497b70b2ec
parent b1d369e144c958e4eb22d795f7a9f816d4e85653
author madhusudancs@gmail.com <madhusudancs@gmail.com@123451ca-8445-de46-9d55-352943316053> 1360204279 +0000
committer madhusudancs@gmail.com <madhusudancs@gmail.com@123451ca-8445-de46-9d55-352943316053> 1360204279 +0000

Fix an issue that arose during the merge of missing to merge a conflicted hunk.

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