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

[Antony Riakiotakis]

Commit: a1994604958992de611130d55b65c0f1e308d819
Author: Antony Riakiotakis
Date:   Thu Feb 19 13:28:18 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBa1994604958992de611130d55b65c0f1e308d819

Merge branch 'master' into gooseberry

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



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