Merged changes in the trunk up to revision 26083.

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_edit.c
Simple merge

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

diff --cc source/blender/makesdna/DNA_scene_types.h
Simple merge

diff --cc source/blender/makesdna/intern/makesdna.c
Simple merge

diff --cc source/blender/makesrna/RNA_access.h
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/python/intern/bpy_interface.c
Simple merge

diff --cc source/blender/render/intern/source/pipeline.c
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge

diff --cc source/creator/SConscript
Simple merge

diff --cc source/creator/creator.c
Simple merge