Vlad Roubtsov - 2004-07-25

I have merged the end of BRANCH_2_0 branch (2.0.4217 release tag) into the trunk to make it the basis of 2.1 development.

Except for bugfixes that are duplicated in 2.0 branch, all new development will be in the trunk (until a release 2.1 branch is created, that is).