This is a new version of patch 1 to fix a bug I accidentally introduced.
The first version I submitted introduced a bug where opentype fonts were
installed into the truetype folder.
-- 
Alex Griffin