tree cd2d9642f82d513662d9beea09c3dc75a1569e23
parent 9e2993ed2e07c21262d83294388e0ff09a005866
author Marco Nelissen <marcone@google.com> 1241125863 -0700
committer Marco Nelissen <marcone@google.com> 1241126159 -0700

Move some simulator fixes from master to donut.
In git master they were part of change 700ccfcc01d3081ff74ef5006e8f0dec5ac52a96,
which was an auto import from //branches/master/...@140412
The original change was 134529 in perforce.