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

[Sergey Sharybin]

Commit: b60e52f7cc1db010c4e81b90b3645a7d8d20429e
Author: Sergey Sharybin
Date:   Fri Jan 16 16:41:56 2015 +0500
Branches: gooseberry
https://developer.blender.org/rBb60e52f7cc1db010c4e81b90b3645a7d8d20429e

Merge branch 'master' into gooseberry

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



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