Merge backout.
commit83cf8db37adf74a7421f59e8d2ce6a60e8d9c2cc
authorDavid Anderson <danderson@mozilla.com>
Mon, 24 May 2010 05:10:06 +0000 (23 22:10 -0700)
committerDavid Anderson <danderson@mozilla.com>
Mon, 24 May 2010 05:10:06 +0000 (23 22:10 -0700)
tree9e808342bab2b1a5d4ef0202005574a81c8e819b
parenta2b6fb959d1f24ed642a5bfa8037aebd6e5502f2
parent73ae5450bc63d8d694a05cee28e35990aaef502b
Merge backout.