PermissionPolicy: merged changes from trunk (r4603,r4606:4608)
Authored by: cboos 2007-01-19
Parent: [r4609]
Child: [r4611]