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