svn merge ^/tags/blender-2.67b-release/blender -c57122

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@57125 954f8c5b-7b00-dc11-b283-0030488c597c