tree bdf2c1a1a96c28b5b34b4bc40b305c124a81c737
parent 55e4a21b55ca50dbccf0e5fb86d7756afba4e510
parent 03207e84deb7e52c98f9a720a860412b4d68be1f
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339221170 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339221170 +0000

merge asterix_opentype_mergeback_staging r311:379

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