[gimp/soc-2009-dynamics: 8/8] Merge commit 'origin/master' into soc-2009-dynamics

[Alexia Death <alexiade src gnome org>]

commit 7a2acf88116aef4459d1e63089d75b9061f756d1
Merge: 212ea4c... fcf5895...
Author: Alexia Death <alexiadeath gmail com>
Date:   Sun Oct 4 11:41:30 2009 +0300

    Merge commit 'origin/master' into soc-2009-dynamics

 app/actions/actions.c           |   20 +++-
 app/core/gimp.c                 |   10 ++
 app/core/gimp.h                 |    3 +
 app/display/gimpdisplay.c       |   25 +++--
 app/display/gimpimagewindow.c   |   91 ++++++++++++++-
 app/display/gimpimagewindow.h   |    6 +
 app/gui/Makefile.am             |    2 +
 app/gui/gimpuiconfigurer.c      |  249 +++++++++++++++++++++++++++++++++++++++
 app/gui/gimpuiconfigurer.h      |   57 +++++++++
 app/gui/gui.c                   |   24 ++++-
 app/widgets/gimpdialogfactory.c |    7 +-
 app/widgets/gimpdockcolumns.c   |   11 ++
 app/widgets/gimpdockcolumns.h   |    2 +
 app/widgets/widgets-types.h     |    1 +
 14 files changed, 486 insertions(+), 22 deletions(-)
---