Merged changes in the trunk up to revision 33894.

A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")

doc/python_api/sphinx_doc_gen.py

@@ -51,7 +51,6 @@ import os
 import inspect
 import bpy
 import rna_info
-reload(rna_info)
 
 # lame, python wont give some access
 ClassMethodDescriptorType = type(dict.__dict__['fromkeys'])