[Bf-blender-cvs] [3de0722] gooseberry: Merge branch 'master' into gooseberry

[Antony Riakiotakis]

Commit: 3de0722234320953f7d7ea17846d8203c0558300
Author: Antony Riakiotakis
Date:   Fri Feb 6 16:44:03 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB3de0722234320953f7d7ea17846d8203c0558300

Merge branch 'master' into gooseberry

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



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