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

[Campbell Barton]

Commit: 316a3e830c08f12fdc62cacd9c3232df0e55c5cf
Author: Campbell Barton
Date:   Thu Nov 13 17:15:24 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB316a3e830c08f12fdc62cacd9c3232df0e55c5cf

Merge branch 'master' into gooseberry

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



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