[mountainlion-changes] sandbox/token token.h,1.7,1.8