svn merge ^/trunk/blender -r49082:49104
authorCampbell Barton <ideasman42@gmail.com>
Sat, 21 Jul 2012 15:40:47 +0000 (15:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 21 Jul 2012 15:40:47 +0000 (15:40 +0000)

Trivial merge