svn merge ^/trunk/blender -r47201:47210
authorCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 08:04:06 +0000 (08:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 30 May 2012 08:04:06 +0000 (08:04 +0000)

Trivial merge