svn merge ^/trunk/blender -r42902:42911
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 08:36:25 +0000 (08:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 08:36:25 +0000 (08:36 +0000)
commit317b3c7f3fc70b34bb43bb8a1fafd42c4f84c08b
treec9da1138a1cb9ec59064e7b23e5b53544a51c9e9
parent8de51d37364e5513523c74fb0435bf256104e88b
parentb459067dd26a8a1e297a2b401f9eddcc4e7be617
svn merge ^/trunk/blender -r42902:42911