svn merge ^/trunk/blender -r49945:49947
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 11:35:14 +0000 (11:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 11:35:14 +0000 (11:35 +0000)

Trivial merge