Merged in trunk@304:314

git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_scheduling@317 123451ca-8445-de46-9d55-352943316053
15 files changed