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

[Sergey Sharybin]

Commit: 6f9982a13c5a7a97520ba922f6160c4b4166c721
Author: Sergey Sharybin
Date:   Tue Feb 10 21:01:22 2015 +0500
Branches: gooseberry
https://developer.blender.org/rB6f9982a13c5a7a97520ba922f6160c4b4166c721

Merge branch 'master' into gooseberry

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



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