[Bf-blender-cvs] [f13bb3f] cycles_kernel_split: Merge branch 'cycles_kernel_split' of git.blender.org:blender into cycles_kernel_split

[Martijn Berger]

Commit: f13bb3f057853c5a0497f4f51ec5f4d99f250d62
Author: Martijn Berger
Date:   Fri May 8 18:04:31 2015 +0200
Branches: cycles_kernel_split
https://developer.blender.org/rBf13bb3f057853c5a0497f4f51ec5f4d99f250d62

Merge branch 'cycles_kernel_split' of git.blender.org:blender into cycles_kernel_split

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



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