svn merge ^/trunk/blender -r55813:55815
authorCampbell Barton <ideasman42@gmail.com>
Fri, 5 Apr 2013 16:27:39 +0000 (16:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 5 Apr 2013 16:27:39 +0000 (16:27 +0000)

Trivial merge