Merging r49226 through r49238 from trunk into soc-2011-tomato

diff --cc source/blender/blenkernel/BKE_mask.h
Simple merge

diff --cc source/blender/blenkernel/intern/colortools.c
Simple merge

diff --cc source/blender/blenkernel/intern/mask.c
Simple merge

diff --cc source/blender/blenkernel/intern/movieclip.c
Simple merge

diff --cc source/blender/blenkernel/intern/scene.c
Simple merge

diff --cc source/blender/editors/space_clip/space_clip.c
Simple merge

diff --cc source/blender/editors/space_image/image_ops.c
Simple merge

diff --cc source/blender/imbuf/intern/filter.c
Simple merge