Commit 9f27998ebf9099e004f7b868fdea76abb39c7180

Werner Lemberg 2009-07-15T12:33:01

Merge branch 'master' of wl@git.sv.gnu.org:/srv/git/freetype/freetype2 Conflicts: ChangeLog Merge.