[gimp/soc-2010-cage-2: 48/50] Merge branch 'master' into soc-2010-cage-2

[Alexia Death <alexiade src gnome org>]

commit 6a22f17ab34c7f2fa432c2ed0b9494e6ec1be9f7
Merge: d98bd74 bfce429
Author: Alexia Death <alexiadeath gmail com>
Date:   Thu Sep 2 18:49:35 2010 +0300

    Merge branch 'master' into soc-2010-cage-2

 app/text/gimptextlayer.c                           |   97 +++++++++-----
 app/text/gimptextlayout.c                          |   59 ++++++---
 app/widgets/gimptextbuffer.c                       |  137 ++++++++++++++++++++
 app/widgets/gimptextbuffer.h                       |    9 ++
 app/widgets/gimptextstyleeditor.c                  |  110 ++++++++++++++--
 app/widgets/gimptextstyleeditor.h                  |    2 +
 app/widgets/gimptexttag.c                          |   20 +++
 app/widgets/gimptexttag.h                          |    3 +
 ...ressed_warnings.txt => suppressed-warnings.txt} |    0
 build/windows/.gitignore                           |    8 +-
 build/windows/Makefile.am                          |   16 +-
 build/windows/gimp-plug-ins.rc.in                  |    2 +-
 build/windows/gimprc-plug-ins.rule                 |   12 +-
 libgimpwidgets/gimpcairo-utils.h                   |    7 +-
 14 files changed, 396 insertions(+), 86 deletions(-)
---