[mountainlion-changes] sandbox/token token.h,1.4,1.5