svn merge ^/trunk/blender -r48245:48254
authorCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2012 07:41:01 +0000 (07:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 25 Jun 2012 07:41:01 +0000 (07:41 +0000)

Trivial merge