Status file automatic merge did not work

Status file automatic merge did not work
Committed: https://code.google.com/p/dart/source/detail?r=12665

[Alan Knight, 2012-09-20 23:39:41]

Syncing the status file did not work, and a test that was intended to be failing
under dartc instead was marked as failing under Windows.

[Emily Fortuna, 2012-09-20 23:55:14]

lgtm