public marks

PUBLIC MARKS from crazybaud with tags zcurrent.krb & comp