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

[Campbell Barton]

Commit: 67e48a5b04232da859f2d9d7b5ab37630d8a7bdb
Author: Campbell Barton
Date:   Sat Nov 15 20:52:11 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB67e48a5b04232da859f2d9d7b5ab37630d8a7bdb

Merge branch 'master' into gooseberry

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



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