tree 83381b332ebeddadf0ca4af663e5d4fa9ba15647
parent c685a46afcd198e852a33e895a0f4228a2c25ee6
parent 8135e25a07cf7dd70ac5e827129feba33a7c4382
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354736533 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1354736533 +0000

merge asterix_stabilization 965:996 to asterix_stabilization_yfix

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