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

[Antony Riakiotakis]

Commit: 7a9492db9f1e34bfea5c6303c0d4a6ee73c745bb
Author: Antony Riakiotakis
Date:   Thu Mar 26 14:50:50 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB7a9492db9f1e34bfea5c6303c0d4a6ee73c745bb

Merge branch 'master' into gooseberry

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



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