svn merge ^/trunk/blender -r50156:50159
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 15:16:57 +0000 (15:16 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Aug 2012 15:16:57 +0000 (15:16 +0000)

Trivial merge