[Bf-blender-cvs] [9bad1c6] temp-startup_blend: Merge branch 'master' into temp-startup_blend

[Campbell Barton]

Commit: 9bad1c6ece016028b22c233246efdb2d58a2653f
Author: Campbell Barton
Date:   Wed Dec 10 11:21:14 2014 +0100
Branches: temp-startup_blend
https://developer.blender.org/rB9bad1c6ece016028b22c233246efdb2d58a2653f

Merge branch 'master' into temp-startup_blend

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



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