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

[Bastien Montagne]

Commit: 6e5b21f808b825d8bd86e7b88cfe8721ee0377b0
Author: Bastien Montagne
Date:   Sun Jan 18 18:51:08 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB6e5b21f808b825d8bd86e7b88cfe8721ee0377b0

Merge branch 'master' into gooseberry

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



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