author Benjamin Smedberg <>
Mon, 21 Jun 2010 11:41:42 -0400
changeset 47008 79ae7224e6273199d0db9638043e531942bc10fd
parent 34808 2d854f2c85f6af569b052ff9678ce4138af1f116
permissions -rw-r--r--
Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.

<title>Bug 497665 iframe</title>
<img src="bug497665.sjs" width="100" height="100" id="image1" />
<img src="bug497665.sjs" width="100" height="100" id="image2" />