Merged 15170:15635 from trunk (no conflicts or even merges)

source/blender/python/api2_2x/sceneRender.c

@@ -985,7 +985,7 @@ PyObject *RenderData_EnableCropping( void )
 /*	return M_Render_BitToggleInt( args, R_MOVIECROP,
 				      &self->renderContext->mode );
 */
-	printf("cropping option is now default, obsolete\n");
+	printf("obsolete: movie cropping option is now default\n");
 	Py_RETURN_NONE;
 }