tree dc1f7d8d2d9ceb253ac7afee5672bf5f08f18e39
parent 4b00f62554eb9e3b1701d1b701f77fe40e5e73c8
parent 4ce86146a40f9a72d65698f8927d8268044c3a70
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339165318 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339165318 +0000

merge asterix_opentye r365:372

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