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