Merged -r572:573 from trunk

git-svn-id: https://hyracks.googlecode.com/svn/branches/hyracks_dev_next@836 123451ca-8445-de46-9d55-352943316053
7 files changed