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