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

[Sergey Sharybin]

Commit: ae7d197c9326232d662c0d00db8e8b2737bfd029
Author: Sergey Sharybin
Date:   Wed Feb 11 18:29:11 2015 +0500
Branches: gooseberry
https://developer.blender.org/rBae7d197c9326232d662c0d00db8e8b2737bfd029

Merge branch 'master' into gooseberry

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



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