[Bf-blender-cvs] [76b5622] soc-2013-depsgraph_mt: Merge branch 'master' into soc-2013-depsgraph_mt

[Sergey Sharybin]

Commit: 76b562237f31a804cd2eba9e3af6effa54f31b5b
Author: Sergey Sharybin
Date:   Fri Dec 27 17:05:49 2013 +0600
https://developer.blender.org/rB76b562237f31a804cd2eba9e3af6effa54f31b5b

Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
	source/blender/blenkernel/intern/constraint.c
	source/blender/blenkernel/intern/depsgraph.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenkernel/intern/scene.c
	source/blender/blenkernel/intern/shrinkwrap.c
	source/blender/collada/AnimationExporter.cpp
	source/blender/editors/space_image/image_ops.c
	source/blender/editors/space_view3d/view3d_view.c
	source/blender/makesrna/intern/rna_scene.c
	source/blender/modifiers/intern/MOD_util.c
	source/blender/render/intern/source/pipeline.c

===================================================================



===================================================================