svn merge ^/trunk/blender -r48070:48078
authorCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 13:48:19 +0000 (13:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 19 Jun 2012 13:48:19 +0000 (13:48 +0000)
commita3680a35a6f57e54c0cfb9392e16bb62d052b7c3
treed541d1d0ca5f97f656e1ce3c99639b1863e9d945
parentb2eafb5012cfa5026eadd03103b7923d13b3e698
parentcf2ae76347d48f37ffb69c4e1f946aded5f1099a
svn merge ^/trunk/blender -r48070:48078