tree 1f695e3f3f61052766ceb293be29d684efed7b97
parent 48632b4bace77824799671bbddaf9cf36052ee86
parent f5ee12b1e8c141e8cf407692572c8d4cfe9c424b
author buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> 1364197029 +0000
committer buyingyi <buyingyi@123451ca-8445-de46-9d55-352943316053> 1364197029 +0000

merge -r3173:3188 https://hyracks.googlecode.com/svn/branches/fullstack_release_candidate@3234; merge -r 3209:3233 from trunk

git-svn-id: https://hyracks.googlecode.com/svn/branches/fullstack_asterix_stabilization@3236 123451ca-8445-de46-9d55-352943316053