tree bdf2c1a1a96c28b5b34b4bc40b305c124a81c737
parent 177662ec3aa84d36e3412255a7e1d7d8557cd99a
parent c29e968108e706a183638d5b1e6bf4809991e3b1
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339203324 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339203324 +0000

merge asterix_stabilization r335:377 and asterix_opentype r377:378

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