Merge 136878

LayoutTests/ChangeLog

Index: LayoutTests/ChangeLog
===================================================================
--- LayoutTests/ChangeLog	(revision 136959)
+++ LayoutTests/ChangeLog	(working copy)
@@ -1,3 +1,15 @@
+2012-12-06  Tony Chang  <tony@chromium.org>
+
+        REGRESSION(r135082): Restore the ability to insert author level style sheets from script
+        https://bugs.webkit.org/show_bug.cgi?id=104042
+
+        Reviewed by Antti Koivisto.
+
+        Add a test that makes sure that an author level style is set.
+
+        * userscripts/insert-stylesheets-expected.txt: Added.
+        * userscripts/insert-stylesheets.html: Added.
+
 2012-11-18  Antti Koivisto  <antti@apple.com>
 
         REGRESSION(r129644): User StyleSheet not applying
@@ -2060,7 +2072,6 @@
         * platform/chromium-win/svg/dynamic-updates/SVGFEComponentTransferElement-svgdom-tableValues-prop-expected.png:
         * platform/chromium/TestExpectations:
 
->>>>>>> .r128909
 2012-09-18  Julien Chaffraix  <jchaffraix@webkit.org>
 
         Tables without any descendant and auto logical width should have a 0px logical width