merge with trunk at r27259 and commit of a patch by anthony jones to fix msvc (though further work may be needed because changes made by the merge

source/blender/blenkernel/SConscript

@@ -56,6 +56,10 @@ if env['WITH_BF_QUICKTIME']:
 if env['WITH_BF_BULLET']:
 	defs.append('USE_BULLET')
 
+if env['OURPLATFORM'] == 'darwin':
+    if env['WITH_BF_OPENMP']:
+       defs.append('PARALLEL=1')
+
 if env['BF_NO_ELBEEM']:
 	defs.append('DISABLE_ELBEEM')