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

[Campbell Barton]

Commit: c77eefb1f0e1580630d6228d6639350205dd781c
Author: Campbell Barton
Date:   Thu Nov 13 17:44:10 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBc77eefb1f0e1580630d6228d6639350205dd781c

Merge branch 'master' into gooseberry

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



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