Merge of trunk into blender 2.5:
[blender.git] / source / blender / editors / object / SConscript