svn merge ^/trunk/blender -r48004:48011
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 21:06:30 +0000 (21:06 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 21:06:30 +0000 (21:06 +0000)

Trivial merge