tree 5b78a9696d1fd3ddb607e2dc41469b4dc358f0d3
parent 8c1113e9defddb29f8ab3734eaa2803226d7d613
parent b5f3ace160b15fc9f1a957196c0e09ebbe9c42bc
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1337671974 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1337671974 +0000

merge from asterix_opentype r303:339 for code review

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