Merged changes in the trunk up to revision 31403.

diff --cc release/scripts/ui/space_userpref.py
Simple merge

diff --cc source/blender/blenkernel/intern/material.c
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/editors/interface/interface_templates.c
Simple merge

diff --cc source/blender/editors/space_outliner/outliner.c
Simple merge

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

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

diff --cc source/blender/python/CMakeLists.txt
index 39c28fe2b94633f1efd2691a6bb4ad884c009a52,dcfc8678faa23b4a69399f424995963cd8a38eb9..5fda5076745706727bb894eb36bf08733a3a918d
--- 1/source/blender/python/CMakeLists.txt
--- 2/source/blender/python/CMakeLists.txt
+++ b/source/blender/python/CMakeLists.txt
@@@ -35,8 -35,8 +35,9 @@@ SET(IN
        ../blenkernel
        ../windowmanager
        ../editors/include
 +      ../freestyle/intern/python
        ../../../intern/guardedalloc
+       ../../../intern/audaspace/intern
        ${PYTHON_INC}
  )
  

diff --cc source/blender/python/SConscript
index c9dc60dcc924bf095406dc4aa640efa617018706,f062f64249c219ede97bd1620c99521e62123a46..277f2df04566bb52706f239808ff24fd23e99555
--- 1/source/blender/python/SConscript
--- 2/source/blender/python/SConscript
+++ b/source/blender/python/SConscript
@@@ -5,9 -5,8 +5,9 @@@ sources = env.Glob('intern/*.c'
  
  incs = '. ../editors/include ../makesdna ../makesrna ../blenlib ../blenkernel ../nodes'
  incs += ' ../imbuf ../blenloader ../render/extern/include ../windowmanager'
 +incs += ' ../freestyle/intern/python'
  incs += ' #intern/guardedalloc #intern/memutil #extern/glew/include'
- incs += ' ' + env['BF_PYTHON_INC']
+ incs += ' #intern/audaspace/intern ' + env['BF_PYTHON_INC']
  
  defs = []
  

diff --cc source/blender/python/doc/sphinx_doc_gen.py
index b9a14f59e2cd691575677641700cc48c4e08caa2,92f795084f3062492cd14e80c5a09bf2676dfa9e..338bb39778d9fc2e7cc2f47dbeeca411c43a143a
--- 1/source/blender/python/doc/sphinx_doc_gen.py
--- 2/source/blender/python/doc/sphinx_doc_gen.py
+++ b/source/blender/python/doc/sphinx_doc_gen.py
@@@ -387,8 -382,8 +389,9 @@@ def rna2sphinx(BASEPATH)
  
  
      fw("   mathutils.rst\n\n")
 +    fw("   Freestyle.rst\n\n")
      fw("   blf.rst\n\n")
+     fw("   aud.rst\n\n")
      
      # game engine
      fw("===================\n")

diff --cc source/blender/python/intern/bpy.c
index 8319213a789606a5dd8954a9f3f9e46c53ff3b39,03c1a0125750a3da2dd1071fcbcddb0a13c3ba5b..d9052471e5d280c825f423eec21dd07a6da15434
--- 1/source/blender/python/intern/bpy.c
--- 2/source/blender/python/intern/bpy.c
+++ b/source/blender/python/intern/bpy.c
@@@ -41,8 -41,8 +41,10 @@@
  #include "../generic/blf_api.h"
  #include "../generic/IDProp.h"
  
+ #include "AUD_PyInit.h"
+ 
 +#include "BPy_Freestyle.h"
 +
  static char bpy_script_paths_doc[] =
  ".. function:: script_paths()\n"
  "\n"
@@@ -155,9 -155,8 +157,9 @@@ void BPy_init_modules( void 
        BGL_Init();
        BLF_Init();
        IDProp_Init_Types();
+       AUD_initPython();
 +      Freestyle_Init();
  
- 
        mod = PyModule_New("_bpy");
  
        /* add the module so we can import it */

diff --cc source/blender/render/extern/include/RE_pipeline.h
Simple merge

diff --cc source/blender/render/intern/source/pipeline.c
Simple merge

diff --cc source/creator/creator.c
Simple merge