svn merge ^/trunk/blender -r49175:49177
authorCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 13:02:54 +0000 (13:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 24 Jul 2012 13:02:54 +0000 (13:02 +0000)

Trivial merge