[pango/harfbuzz-ng: 57/57] Merge branch 'master' into harfbuzz-ng

[Behdad Esfahbod <behdad src gnome org>]

commit d327d7fed4068f0fd69673cbc73b22d57476baa2
Merge: 6a4933a... 091be0f...
Author: Behdad Esfahbod <behdad behdad org>
Date:   Tue Aug 4 15:59:23 2009 -0400

    Merge branch 'master' into harfbuzz-ng

 modules/basic/basic-atsui.c  |    6 +++---
 pango-view/Makefile.am       |    6 ------
 pango/pangoatsui-private.h   |    4 ++--
 pango/pangoatsui.c           |   16 ++++++++--------
 pango/pangoatsui.h           |    2 +-
 pango/pangocairo-atsuifont.c |   33 +++++++++++++++++----------------
 6 files changed, 31 insertions(+), 36 deletions(-)
---