svn merge ^/trunk/blender -r48276:48283
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2012 18:03:19 +0000 (18:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2012 18:03:19 +0000 (18:03 +0000)

Trivial merge