Merging r46495 through r46557 from trunk into soc-2011-tomato

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

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

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

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

diff --cc source/blender/editors/space_node/drawnode.c
Simple merge

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

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

diff --cc source/blender/makesrna/intern/rna_internal.h
Simple merge

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

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