[pango/harfbuzz-ng-external: 24/28] Merge branch 'master' into harfbuzz-ng-external

[Behdad Esfahbod <behdad src gnome org>]

commit 9ac5bce958cb2ac500148dcd80c0d2c6877f7e4c
Merge: dff1f2b 08fd5cf
Author: Behdad Esfahbod <behdad behdad org>
Date:   Fri Apr 15 18:45:24 2011 -0400

    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

 autogen.sh                 |   38 +++++++------
 configure.in               |    4 +-
 docs/Makefile.am           |    2 +
 git.mk                     |   17 +++++-
 modules/hangul/hangul-fc.c |    7 ++-
 pango/Makefile.am          |   13 +++--
 pango/fonts.c              |   32 ++---------
 pango/glyphstring.c        |   15 +----
 pango/pango-attributes.c   |   19 ++-----
 pango/pango-color.c        |   15 +----
 pango/pango-glyph-item.c   |   28 ++--------
 pango/pango-item.c         |   14 +----
 pango/pango-language.c     |   14 +----
 pango/pango-layout.c       |  130 +++++++++++++++++++-------------------------
 pango/pango-markup.c       |    6 +-
 pango/pango-matrix.c       |   15 +----
 pango/pango-tabs.c         |   14 +----
 pango/pangocairo-font.c    |    2 +
 pango/pangoft2-render.c    |   16 +++++-
 19 files changed, 161 insertions(+), 240 deletions(-)
---