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

[Campbell Barton]

Commit: d7fcab7e2528c411ac00c52bfc7a78f00b70dd64
Author: Campbell Barton
Date:   Fri Nov 14 14:34:59 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBd7fcab7e2528c411ac00c52bfc7a78f00b70dd64

Merge branch 'master' into gooseberry

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



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