c6bec43330
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender
svn merge -r 29067:29066 https://svn.blender.org/svnroot/bf-blender/trunk/blender