Merging r47535 through r47566 from trunk into soc-2011-tomato

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

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

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

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

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

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