Merge backout.
commitb76f0e1ad1b79d244be4dce49d15c541578dd6d3
authorDavid Anderson <danderson@mozilla.com>
Wed, 8 Sep 2010 04:52:13 +0000 (7 21:52 -0700)
committerDavid Anderson <danderson@mozilla.com>
Wed, 8 Sep 2010 04:52:13 +0000 (7 21:52 -0700)
tree50c49190b2d32393f1453c325fcd2828130ccbad
parentb3d71891c2b494d30ca434a9d7d5efb21ccb3f88
parent5a2cbe162501d206666fd14e6d35759efa3c6c95
Merge backout.