* merge in matts r6917 so it doesn't colide with ongoing changes.
drwxr-xr-x - citadel
drwxr-xr-x - contrib
drwxr-xr-x - ctdlphp
drwxr-xr-x - libcitadel
drwxr-xr-x - webcit