tree 18694e9e039c9d0226d9358b7b62edfa43a23e24
parent d793da87ca3826205b5b7e6404cda9f7ffb302d0
parent 79c806a88108e8644f9010436811799f6b09600a
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354877396 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354877396 +0000

merge r997:1019 from asterix_stabilization to asterix_stabilization_yfix

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