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

[Bastien Montagne]

Commit: 9adb6daa8cd566271f8cc48b45a5d8ee7d1a19e6
Author: Bastien Montagne
Date:   Wed Feb 11 11:19:13 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB9adb6daa8cd566271f8cc48b45a5d8ee7d1a19e6

Merge branch 'master' into gooseberry

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



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