https://svn.blender.org/svnroot/bf-blender/trunk/blender, in sync with trunk now

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

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

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

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