svn merge ^/trunk/blender -r42931:42935
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:28:56 +0000 (14:28 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 14:28:56 +0000 (14:28 +0000)
commit26b0bdc1957d39bea099bb245b88170b5472940b
treef08cad5f64c5e78ee86fea09cd2be393ab5e6736
parentac4579d4c9de9daeaa3a2b8ce79822c33a995084
parent7c417fbcfb5e111ffc3f8d48d78605deb29a2ffe
svn merge ^/trunk/blender -r42931:42935