svn merge ^/trunk/blender -r49518:49520
authorCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 09:53:24 +0000 (09:53 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 3 Aug 2012 09:53:24 +0000 (09:53 +0000)
commitd3d510740cd0538969c4afb6b25f79a58df6b355
treeb0e39245ce2d8a029495452bfacf70938f6198d4
parentf736f183a5b94ba80aaeb4cfef7ff1fb9d5f7850
parent52e31a4866ab8db0079c494348dfd642b6694935
svn merge ^/trunk/blender -r49518:49520