svn merge ^/trunk/blender -r48011:48095
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 19 Jun 2012 19:37:59 +0000 (19:37 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 19 Jun 2012 19:37:59 +0000 (19:37 +0000)

Trivial merge