tree db8020c0f50df57aae54d72d67509a407a9e68bd
parent 55f44941a8ae49afeebcaf8353eed16e5dcc25cf
parent d3f23d54b7761ddd4d40ad5a12213aa9e9393aa3
author buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339192471 +0000
committer buyingyi <buyingyi@eaa15691-b419-025a-1212-ee371bd00084> 1339192471 +0000

merge asterix_opentype r373:374

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