author David Anderson <>
Fri, 05 Aug 2011 19:38:49 -0700
changeset 105058 1676cf93aa308abae9b00a9b861e731db250ec4d
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge from mozilla-central.

Please see the file toolkit/content/license.html for the copyright licensing
conditions attached to this codebase, including copies of the licenses

You are not granted rights or licenses to the trademarks of the
Mozilla Foundation or any party, including without limitation the
Firefox name or logo.

For more information, see: