Merge backout.
commit65d6a88c3abd2670d4ff69a7d8a3b8adecc4d958
authorDavid Anderson <danderson@mozilla.com>
Fri, 15 Oct 2010 22:30:17 +0000 (15 15:30 -0700)
committerDavid Anderson <danderson@mozilla.com>
Fri, 15 Oct 2010 22:30:17 +0000 (15 15:30 -0700)
tree962c91975ab64877cb85be1926ef8e702c039d7e
parenta106f1c145375cea76039522ca3b35d287f4fde2
parentcbfe17f02c55839011c9aa1fc3967c08a80d048c
Merge backout.