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

[Sergey Sharybin]

Commit: 30a324013a5f7435ca9d78e6c6b7c576b6a20523
Author: Sergey Sharybin
Date:   Fri Feb 27 12:00:48 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB30a324013a5f7435ca9d78e6c6b7c576b6a20523

Merge branch 'master' into gooseberry

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



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