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

[Campbell Barton]

Commit: a3b9dbf17c043129d152f8ad4e9ce23401ccbf1b
Author: Campbell Barton
Date:   Thu Oct 30 22:34:08 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBa3b9dbf17c043129d152f8ad4e9ce23401ccbf1b

Merge branch 'master' into gooseberry

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



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