svn merge ^/trunk/blender -r49000:49002
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:45:27 +0000 (15:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 15:45:27 +0000 (15:45 +0000)
commitce74956b86430c9b757979b88a5656a7c808a003
tree69917bd59eaf39c4c3053717d1666fb2acfa757b
parent573c373babfdb8c16e0890dfc6fb551f3135236e
parent2945ba9e5edb8da2258585ae40e845d763b78d5d
svn merge ^/trunk/blender -r49000:49002