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

[Campbell Barton]

Commit: 82401df4b2da44ba053f76306af59700119f195f
Author: Campbell Barton
Date:   Fri Nov 21 16:30:10 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB82401df4b2da44ba053f76306af59700119f195f

Merge branch 'master' into gooseberry

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



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