[mountainlion-changes] sandbox/token token.c, NONE, 1.1 token.h, 1.2, 1.3