Merge branch 'master' into harfbuzz-ng
authorBehdad Esfahbod <behdad@behdad.org>
Sat, 25 Jul 2009 23:08:41 +0000 (19:08 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Sat, 25 Jul 2009 23:08:41 +0000 (19:08 -0400)

Trivial merge