Some more cleanup and merging. 2007-11-07 Behdad Esfahbod <behdad@gnome.org> * pango/opentype/*: Some more cleanup and merging.