merge asterix_opentype_mergeback_staging to asterix_opentype

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