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

[Alexia Death <alexiade src gnome org>]

commit d6a59dca3596200631ae339eeafb3cdb6a38ceec
Merge: 4aa3d3f... 61db48a...
Author: Alexia Death <alexiadeath gmail com>
Date:   Wed Jul 22 19:48:52 2009 +0300

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

 app/actions/dialogs-actions.c      |    6 -
 app/actions/tools-actions.c        |   82 -------
 app/actions/tools-commands.c       |  152 -------------
 app/actions/tools-commands.h       |   14 --
 app/dialogs/dialogs-constructors.c |   25 ---
 app/dialogs/dialogs-constructors.h |    6 -
 app/dialogs/dialogs.c              |    2 -
 app/dialogs/preferences-dialog.c   |   15 ++
 app/menus/menus.c                  |    7 -
 app/widgets/Makefile.am            |    4 +-
 app/widgets/gimptooleditor.c       |  416 ++++++++++++++++++++++++++++++++++++
 app/widgets/gimptooleditor.h       |   58 +++++
 app/widgets/gimptoolview.c         |  291 -------------------------
 app/widgets/gimptoolview.h         |   65 ------
 app/widgets/widgets-types.h        |    2 +-
 menus/Makefile.am                  |    1 -
 menus/dialogs-menuitems.xml        |    1 -
 menus/tools-menu.xml               |   10 -
 plug-ins/file-bmp/bmp-read.c       |   35 +++-
 plug-ins/help-browser/dialog.c     |    2 +-
 20 files changed, 524 insertions(+), 670 deletions(-)
---