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