[Bf-blender-cvs] [683cef0] cycles_kernel_split: Merge branch 'master' into cycles_kernel_split

[Sergey Sharybin]

Commit: 683cef0374d4b23b9b6a461da877954ace5078b0
Author: Sergey Sharybin
Date:   Sat May 9 19:58:42 2015 +0500
Branches: cycles_kernel_split
https://developer.blender.org/rB683cef0374d4b23b9b6a461da877954ace5078b0

Merge branch 'master' into cycles_kernel_split

Conflicts:
	intern/cycles/device/device.h
	intern/cycles/kernel/kernel_types.h

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



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