svn merge ^/trunk/blender -r47229:47253
authorCampbell Barton <ideasman42@gmail.com>
Thu, 31 May 2012 07:57:04 +0000 (07:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 31 May 2012 07:57:04 +0000 (07:57 +0000)

Trivial merge