svn merge ^/trunk/blender -r48995:49000
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:18:02 +0000 (15:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:18:02 +0000 (15:18 +0000)
commit573c373babfdb8c16e0890dfc6fb551f3135236e
treece6d72fc001f65b8a963b43c0c588d778eeb1c10
parent8f85e93ea69a313fa77ad551a7a4c39797f1c0e1
parent46bec423333d3cee3401bf967c6adff257f8b310
svn merge ^/trunk/blender -r48995:49000