Robert Greenwalt b097fbbff3 DO NOT MERGE Reverting change I53e91db7.
Accidentally submitted into eclair instead of eclair-mr2.
I apparently rebased my mr2 working dir to eclair by mistake.

Do not merge this so the desired change will survive on mr2 as intended.

bug: 2265222
2009-12-07 15:20:50 -08:00
..
2009-12-03 11:35:37 -08:00