svn merge ^/trunk/blender -r49929:49933
authorCampbell Barton <ideasman42@gmail.com>
Thu, 16 Aug 2012 10:15:05 +0000 (10:15 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 16 Aug 2012 10:15:05 +0000 (10:15 +0000)
commita843a13008fb2f0d024405f4575666831cbe5809
treef210871fa289be3798e6e8af0884edf7b77e8fb3
parent63b5338dbd8706764d12d3890559a71bb0fb2099
parentadd9aea57391a6c496a0541d97ef870c442adc81
svn merge ^/trunk/blender -r49929:49933