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)
commitd327d7fed4068f0fd69673cbc73b22d57476baa2
tree5b739733dfafc9f66904c5ffa6cdfe5b084b0fe1
parent6a4933ab14b6786fc7f347f1e1c41c0b038a0a6f
parent091be0f7d8d06d38bf72c8f2521b2ab8808043d5
Merge branch 'master' into harfbuzz-ng