10d59e7208
svn merge -r14988:15170 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r14988:15170 https://svn.blender.org/svnroot/bf-blender/trunk/blender