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

[Sergey Sharybin]

Commit: 78fb421f4ba2b7eed8694ef51e015b8e6a34f271
Author: Sergey Sharybin
Date:   Thu Feb 19 22:20:12 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB78fb421f4ba2b7eed8694ef51e015b8e6a34f271

Merge branch 'master' into gooseberry

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



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