Merge branch 'master' into harfbuzz-ng-external
authorBehdad Esfahbod <behdad@behdad.org>
Fri, 15 Apr 2011 22:45:24 +0000 (18:45 -0400)
committerBehdad Esfahbod <behdad@behdad.org>
Fri, 15 Apr 2011 22:45:24 +0000 (18:45 -0400)
commit9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c
treed2a207b07ae2cedae0ba2f4d007fa7be405b2fb7
parentdff1f2b0d6c353f0839a7a38115c69cd915f9cbd
parent08fd5cf33d875c161dd5280b92d1633469943620
Merge branch 'master' into harfbuzz-ng-external

Conflicts:
pango/opentype/hb-buffer-private.h
pango/opentype/hb-buffer.c
pango/opentype/hb-buffer.h
pango/opentype/hb-open-type-private.hh
pango/opentype/hb-ot-layout-gpos-private.hh
configure.in
pango/Makefile.am