[mountainlion-changes] sandbox/settings _Parse_short_argument.c, 1.3, 1.4 settings.c, 1.5, 1.6