svn merge ^/trunk/blender -r45927:46000
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 6 May 2012 19:32:53 +0000 (19:32 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 6 May 2012 19:32:53 +0000 (19:32 +0000)

Trivial merge