svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28571:28573 svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28575:28576
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28571:28573 svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r28575:28576