[Bf-blender-cvs] [e306e99] viewport_experiments: Merge branch 'master' into viewport_experiments

[Antony Riakiotakis]

Commit: e306e99574a0feab763b06b55526cc4fefcb721c
Author: Antony Riakiotakis
Date:   Mon Jan 5 14:34:08 2015 +0100
Branches: viewport_experiments
https://developer.blender.org/rBe306e99574a0feab763b06b55526cc4fefcb721c

Merge branch 'master' into viewport_experiments

Making clamping correct fixes the issues of depth of field having a dark
fringe at the edges of the screen.

===================================================================



===================================================================