author Doug Turner <>
Thu, 29 Apr 2010 21:04:50 -0700
changeset 46839 288aeb67ac3794b0c62098faaad3ceb58cfc8b09
parent 40458 1584ba8c1b86f9c4de5ccda5241cef36e80f042c
permissions -rw-r--r--
Merge with m-c. no hand edits

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: