Merging trunk into soc-2011-tomato.

Pardon, lost message about which revisions are going to be merged..

diff --cc CMakeLists.txt
Simple merge

diff --cc build_files/scons/config/linuxcross-config.py
index 98100e3d5817b1e65a511427e1aa06968ca40bd9,563b1ad980c53ee7024ad1df697b80f582ae1e68..94a331042119c6babbed647c0b471a05bfbefb83
--- 1/build_files/scons/config/linuxcross-config.py
--- 2/build_files/scons/config/linuxcross-config.py
+++ b/build_files/scons/config/linuxcross-config.py
@@@ -125,9 -125,8 +125,9 @@@ WITH_BF_BINRELOC = Fals
  
  # enable ffmpeg  support
  WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
- BF_FFMPEG = LIBDIR + '/ffmpeg-0.8'
+ BF_FFMPEG = LIBDIR + '/ffmpeg'
  BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
 +BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
  BF_FFMPEG_INC = '${BF_FFMPEG}/include'
  BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
  

diff --cc build_files/scons/config/win32-mingw-config.py
index 6134d3c11c45ba25830553308c9774ec8e0d595d,b29c4845a9c6a37864f56182046e730735b4cd84..ebc459e2cce6f6b5343904a92162bcaaaf551f42
--- 1/build_files/scons/config/win32-mingw-config.py
--- 2/build_files/scons/config/win32-mingw-config.py
+++ b/build_files/scons/config/win32-mingw-config.py
@@@ -19,10 -19,8 +19,10 @@@ BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib
  
  WITH_BF_FFMPEG = False
  BF_FFMPEG_LIB = 'avformat-53 avcodec-53 avdevice-53 avutil-51 swscale-2'
- BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg-0.8/lib'
- BF_FFMPEG_INC =  LIBDIR + '/ffmpeg-0.8/include'
+ BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
+ BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
 +BF_FFMPEG_DLL = '${BF_FFMPEG_LIBPATH}/avformat-53.dll ${BF_FFMPEG_LIBPATH}/avcodec-53.dll ${BF_FFMPEG_LIBPATH}/avdevice-53.dll ${BF_FFMPEG_LIBPATH}/avutil-51.dll ${BF_FFMPEG_LIBPATH}/swscale-2.dll'
 +
  
  BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
  BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'

diff --cc build_files/scons/tools/Blender.py
Simple merge

diff --cc build_files/scons/tools/btools.py
Simple merge

diff --cc release/scripts/startup/bl_ui/__init__.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_data_camera.py
index abc824261f3c1ab1967e0a98c0ea4c516110a561,5255af40951d6604fba37cf071695f224eec16b0..5fbb214f8d5d11702523ee555af9cc56271999ea
--- 1/release/scripts/startup/bl_ui/properties_data_camera.py
--- 2/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@@ -98,16 -90,6 +98,16 @@@ class DATA_PT_lens(CameraButtonsPanel, 
  
          split = layout.split()
  
-         if cam.dof_object != None:
 +        col = split.column()
 +        col.label(text="Depth of Field:")
 +
 +        col.prop(cam, "dof_object", text="")
 +
 +        col = col.column()
++        if cam.dof_object is not None:
 +            col.enabled = False
 +        col.prop(cam, "dof_distance", text="Distance")
 +
          col = split.column(align=True)
          col.label(text="Shift:")
          col.prop(cam, "shift_x", text="X")

diff --cc release/scripts/startup/bl_ui/space_userpref_keymap.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
Simple merge

diff --cc source/blender/blenlib/intern/math_rotation.c
Simple merge

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

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

diff --cc source/blender/editors/interface/interface_draw.c
Simple merge

diff --cc source/blender/editors/interface/interface_widgets.c
Simple merge

diff --cc source/blender/editors/space_sequencer/sequencer_edit.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_draw.c
Simple merge

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

diff --cc source/blender/imbuf/intern/filter.c
Simple merge

diff --cc source/blender/makesrna/intern/CMakeLists.txt
Simple merge

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

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

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

diff --cc source/blender/windowmanager/intern/wm_operators.c
Simple merge

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

diff --cc source/creator/creator.c
index 841a97ecea30bbba1741030fe4db98f6d8932854,9b2cfb0838230c66534d93db0a0a31d94071133c..591c8fe3b6a2dcdfb9e049ef9c6f5a412b65e63a
--- 1/source/creator/creator.c
--- 2/source/creator/creator.c
+++ b/source/creator/creator.c
@@@ -373,14 -355,10 +359,14 @@@ static int debug_mode(int UNUSED(argc)
        printf(BLEND_VERSION_STRING_FMT);
        MEM_set_memory_debug();
  
- #ifdef NAN_BUILDINFO
+ #ifdef WITH_BUILDINFO
        printf("Build: %s %s %s %s\n", build_date, build_time, build_platform, build_type);
- #endif // NAN_BUILDINFO
+ #endif // WITH_BUILDINFO
  
 +#ifdef WITH_LIBMV
 +      libmv_startDebugLogging();
 +#endif
 +
        BLI_argsPrint(data);
        return 0;
  }