Merging python, C++ from 0-9 to trunk.

[Alan Conway]

Now that we've got an M2 branch I'll start merging. Be aware of what 
you're committing and make sure it goes on the right branch.
If you have work that belongs on both, do it on M2 and use svnmerge.py 
to merge it to the trunk.

Cheers,
Alan.