merge with r500

git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_function_merge@501 eaa15691-b419-025a-1212-ee371bd00084