svn merge ^/trunk/blender -r48729:48739
authorCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jul 2012 18:21:51 +0000 (18:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 8 Jul 2012 18:21:51 +0000 (18:21 +0000)

Trivial merge