author David Anderson <>
Mon, 27 Feb 2012 12:40:46 -0800
changeset 105890 c757b4a747a5d92e54403998abe229cbff299a78
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: