[gegl/gsoc2011-opencl: 41/46] Merge remote-tracking branch 'origin/master' into gsoc2011-opencl

[Victor Matheus de Araujo Oliveira <vmaolive src gnome org>]

commit dd833802cc3d54201c598e78f0eb3d94da57623b
Merge: 3df728a f5f6216
Author: Victor Oliveira <victormatheus gmail com>
Date:   Mon Jun 13 18:44:05 2011 -0300

    Merge remote-tracking branch 'origin/master' into gsoc2011-opencl

 docs/contribute.html                               |    6 +-
 examples/gegl-paint.c                              |   14 +-
 examples/util/gegl-view.c                          |  176 +-------------------
 examples/util/gegl-view.h                          |    2 -
 gegl/buffer/gegl-buffer-save.c                     |    7 +
 gegl/buffer/gegl-tile-backend-file.c               |    6 +-
 gegl/gegl-chant.h                                  |    7 +-
 gegl/property-types/gegl-path.h                    |   10 +-
 operations/affine/module.c                         |    3 +
 operations/common/buffer-source.c                  |    2 -
 operations/common/dropshadow.c                     |    2 -
 operations/common/exp-combine.c                    |    2 -
 operations/common/introspect.c                     |    2 -
 operations/common/magick-load.c                    |    2 -
 .../common/{map_absolute.c => map-absolute.c}      |  107 ++++++-------
 .../common/{map_absolute.c => map-relative.c}      |  118 +++++++-------
 operations/common/mblur.c                          |    2 -
 operations/common/open-buffer.c                    |    2 -
 operations/common/raw-load.c                       |    2 -
 operations/common/rectangle.c                      |    2 -
 operations/common/unsharp-mask.c                   |    2 -
 operations/external/png-load.c                     |    2 -
 operations/workshop/demosaic-simple.c              |    1 -
 operations/workshop/external/Makefile.am           |    6 +
 operations/workshop/external/jpg-save.c            |  170 +++++++++++++++++++
 tools/img_cmp.c                                    |    4 +-
 tools/operation_reference.c                        |    7 +-
 27 files changed, 321 insertions(+), 345 deletions(-)
---