merge asterix_opentype r340:341, minor changes for file headers

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