svn merge ^/trunk/blender -r47214:47229
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 14:46:30 +0000 (14:46 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 14:46:30 +0000 (14:46 +0000)

Trivial merge