svn merge ^/trunk/blender -r49063:49067
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 13:07:33 +0000 (13:07 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 13:07:33 +0000 (13:07 +0000)
commit7200172990badc32e4d7d1db95ae3470257f85ce
tree589cbe48294f118486c8c62e0da07aa93ef3feec
parent99c97e5aa3c1d46d9ffd0b7932aa5ea65c2c102c
parent2557eaf0dd33e3139cc6188b97029207686360bf
svn merge ^/trunk/blender -r49063:49067