[pango/1.28: 23/24] Merge branch 'master' into 1.28

[Behdad Esfahbod <behdad src gnome org>]

commit 7dc0bb2b5aab78d8d7a299b54351bb0e9a4e888d
Merge: a4ebb72 cf1022c
Author: Behdad Esfahbod <behdad behdad org>
Date:   Tue Jun 15 10:54:36 2010 -0400

    Merge branch 'master' into 1.28
    
    Conflicts:
    	pango/Makefile.am

 pango-view/Makefile.am                          |    2 +-
 pango-view/viewer-render.c                      |   41 ++++-
 pango/opentype/hb-open-file-private.hh          |    3 +-
 pango/opentype/hb-open-type-private.hh          |   69 ++++-----
 pango/opentype/hb-ot-layout-common-private.hh   |   18 ++-
 pango/opentype/hb-ot-layout-gdef-private.hh     |    4 +-
 pango/opentype/hb-ot-layout-gpos-private.hh     |  183 +++++++++++++++++------
 pango/opentype/hb-ot-layout-gsub-private.hh     |   12 +-
 pango/opentype/hb-ot-layout-gsubgpos-private.hh |    8 +-
 pango/opentype/hb-private.h                     |    2 +-
 pango/pango-gravity.c                           |    2 +-
 pango/pango-ot-info.c                           |    4 +-
 pango/pangocairo-atsuifont.c                    |   31 +---
 pango/pangocairo-fcfont.c                       |    8 +-
 pango/pangocairo-font.c                         |   83 ++++++++++-
 pango/pangocairo-private.h                      |    6 +-
 pango/pangocairo-win32font.c                    |   31 +---
 pango/pangofc-font.c                            |   51 +------
 pango/pangofc-private.h                         |    4 +-
 pango/pangoft2.def                              |    2 +-
 20 files changed, 335 insertions(+), 229 deletions(-)
---