Merge backout head.
commit767e4b7dcda30f05e1c94218c0d46e8c3aa18304
authorChris Leary <cdleary@mozilla.com>
Sat, 12 Feb 2011 02:59:33 +0000 (11 18:59 -0800)
committerChris Leary <cdleary@mozilla.com>
Sat, 12 Feb 2011 02:59:33 +0000 (11 18:59 -0800)
tree69fe2aefd27b946bbb7d94ee421787265d1f7fdd
parent3376e0cae42ad3c1f9ad4b3a620f25b0850d13f2
parent70d431e38236010819da8f7ddc4cc0d0589bbe02
Merge backout head.