svn merge ^/trunk/blender -r49082:49104
authorCampbell Barton <ideasman42@gmail.com>
Sat, 21 Jul 2012 15:40:47 +0000 (15:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 21 Jul 2012 15:40:47 +0000 (15:40 +0000)
commit7baf3d2ececce768fd36704cc16c5617c1a74f09
tree3c42a7ef3ea874a586a8ed65bc6bb53cbde1c786
parent44800e884c9d638fb668089d8569888d8ef0502f
parent62a73381a7ec63e75960d3c9545c638c85d3b06a
svn merge ^/trunk/blender -r49082:49104