PermissionPolicy: merge changes from trunk [4658:4693/trunk]
Authored by: cboos 2007-02-06
Parent: [r4695]
Child: [r4697]