From: Keith Packard <keithp@neko.keithp.com>
Date: Sun, 3 Sep 2006 23:07:11 +0000 (-0700)
Subject: Merge branch 'fc-2_4_branch' to master
X-Git-Tag: 2.3.97~14
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=822ec78c54a24a0f1589154ac2d4906b02b111ef;hp=fb2092c18fbf4af69e2cbafc265c4b0ad7e54346;p=fontconfig.git

Merge branch 'fc-2_4_branch' to master

Moving development back to master.
---