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

[Campbell Barton]

Commit: ba0d452357a2e2b1fda01fb980c95f8ba9c7b823
Author: Campbell Barton
Date:   Tue Jan 6 23:11:54 2015 +1100
Branches: gooseberry
https://developer.blender.org/rBba0d452357a2e2b1fda01fb980c95f8ba9c7b823

Merge branch 'master' into gooseberry

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



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