author David Anderson <>
Wed, 01 Feb 2012 14:12:11 -0800
changeset 86786 523fad03a5c43fd40cbb0643dffab36b9129f79a
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: