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

[Alexia Death <alexiade src gnome org>]

commit 7bae9c0827553fbeb699a110d18236eb7062bd57
Merge: 3652313... 53984a8...
Author: Alexia Death <alexiadeath gmail com>
Date:   Tue Oct 13 20:23:34 2009 +0300

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

 app/Makefile.am                        |    4 +-
 app/core/gimpchannel-combine.c         |   26 +-
 app/gimp.rc.in                         |    2 +
 app/widgets/gimpdock.c                 |  223 +-
 app/widgets/gimpdockseparator.c        |  136 +-
 app/widgets/gimpdockseparator.h        |   26 +-
 app/widgets/gimpwidgets-utils.c        |  172 +
 app/widgets/gimpwidgets-utils.h        |  149 +-
 app/widgets/widgets-types.h            |   25 +-
 configure.ac                           |    1 +
 plug-ins/map-object/map-object-shade.c |    2 +-
 po-libgimp/nn.po                       |  673 +-
 po-plug-ins/nn.po                      |14524 ++++++++++++++++----------------
 po-python/nn.po                        |   90 +-
 po-script-fu/nn.po                     |  592 +-
 po/nn.po                               | 5802 +++++++------
 16 files changed, 11373 insertions(+), 11074 deletions(-)
---