tree 4822803741899996355017200d65b9c900d00e90
parent afe406df1779acc80013261d0d03662cc02275ca
parent c26b5ffe3e2b1b8c24186a5901c398768c55c4b1
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339195416 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339195416 +0000

merge asterix_opentype r375:376

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