Merge from trunk -r 25003:25745.
[blender.git] / bin /
drwxr-xr-x   ..
drwxr-xr-x - .blender