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

[Campbell Barton]

Commit: 4dc9ca29de3c50486e32d15652660ae0236251b5
Author: Campbell Barton
Date:   Thu Nov 13 17:14:35 2014 +0100
Branches: gooseberry
https://developer.blender.org/rB4dc9ca29de3c50486e32d15652660ae0236251b5

Merge branch 'master' into gooseberry

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



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