tree cf9213fa77853849ded3e425875d0eb13f29d284
parent 58ebd6b716f54cd08963eaf2afdcfca250dcef1e
parent 86df6e421b9c4f9bd028207fb9720a5c693e24cd
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354929482 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354929482 +0000

merge r997:1029 from asterix_stabilization to asterix_stabilization_yfix

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