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

[Alexia Death <alexiade src gnome org>]

commit 0ca81896e9f2742f5b38c93e139896ebd6c65f37
Merge: 943e8c9... 0012c86...
Author: Alexia Death <alexiadeath gmail com>
Date:   Sun Oct 11 01:05:40 2009 +0300

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

 app/core/gimpchannel-combine.c         |  495 ++++++++++++++------------------
 app/core/gimpchannel-combine.h         |   10 -
 app/core/gimpcontext.h                 |    9 +
 app/widgets/gimpdock.h                 |    2 +
 app/widgets/gimpdockable.h             |    2 +
 app/widgets/gimpdockbook.h             |    2 +
 app/widgets/gimpdockcolumns.h          |    2 +
 app/widgets/gimpdocked.h               |    2 +
 app/widgets/gimpdockseparator.h        |    2 +
 app/widgets/gimpdockwindow.h           |    2 +
 app/widgets/gimpsessioninfo-aux.h      |    2 +
 app/widgets/gimpsessioninfo-book.h     |    2 +
 app/widgets/gimpsessioninfo-dockable.h |    2 +
 app/widgets/gimpsessioninfo.h          |    2 +
 devel-docs/app/app-sections.txt        |    2 -
 15 files changed, 243 insertions(+), 295 deletions(-)
---