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

[Campbell Barton]

Commit: c73b7a67904a5d1b90e94f2fcd7f39455df17ef3
Author: Campbell Barton
Date:   Tue Nov 4 09:23:23 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBc73b7a67904a5d1b90e94f2fcd7f39455df17ef3

Merge branch 'master' into gooseberry

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



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