r1471: more work on merge
treef004756a17f23663c8b6536637b69910c3cd3c84
drwxr-xr-x - SAMBA_3_2_MERGE
drwxr-xr-x - VOYAGER
drwxr-xr-x - abartlet-4_0