merged CVS and Subversion versions
treedb36f1612e3f94b279e854ad4e48c973b3476851
drwxr-xr-x - plugins