Merged changes in the trunk up to revision 34996.

Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript

source/creator/CMakeLists.txt

@@ -573,6 +573,7 @@ endif()
 		bf_dna
 		bf_blenfont
 		bf_intern_audaspace
+		bf_intern_mikktspace
 	)
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")