Merge of trunk into blender 2.5:
[blender-staging.git] / release / VERSION
1 2.48