author David Anderson <>
Tue, 14 Feb 2012 15:04:32 -0800
changeset 105829 132462b85b08292526d3c3d87ecffe552ac81727
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: