Merged in trunk@298:303

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