Merge branch 'master' into harfbuzz-ng
authorBehdad Esfahbod <behdad@behdad.org>
Tue, 4 Aug 2009 19:59:23 +0000 (15:59 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Tue, 4 Aug 2009 19:59:23 +0000 (15:59 -0400)

Trivial merge