Merged changes in the trunk up to revision 42116.
[blender.git] / release / scripts / presets / camera / Nikon_D3S.py