[Soc-2005-dev] Merging

[Chris Want]

OK, I've finally got around to updating the BLENDER_DIST
branch of the CVS tree. This will not affect your work in
any way, but those who want to merge in the latest changes
from the bf-blender tree are welcome to do so. Instructions
on how to do this can be found on the CVS page here:

http://mediawiki.blender.org/index.php/BlenderDev/SummerOfCode2006CVS

Please note that if you decide to merge at this time, be sure
to record the date you merge, since the instructions are a bit
different for subsequent times you merge your tree.

Let me know if there are any questions or problems.

Chris