changes necessary to make validate-policy work again
Authored by: cwilper 2006-11-26
Parent: [r5233]
Child: [r5235]