svn merge ^/trunk/blender -r48313:48321
authorCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 20:36:19 +0000 (20:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 26 Jun 2012 20:36:19 +0000 (20:36 +0000)
commit4b4eace3abdf97ebcecbafd937688071cab4ecdc
treeec1f462385a5d9b1152540d26074475f24fb5fb9
parentc837fcbb4bb3e014715e3c05eb187026fc2dfd6e
parent200584e5c6e020dcb77038a0e399ddfebe91ce63
svn merge ^/trunk/blender -r48313:48321