Merged 229:231 from hyracks_online_aggregation branch

git-svn-id: https://hyracks.googlecode.com/svn/trunk/hyracks@233 123451ca-8445-de46-9d55-352943316053
8 files changed