diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ad74f2f..7f061e5 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,23 @@
+2008-05-29  Mark Rowe  <mrowe@apple.com>
+
+        Merge r34154 to Safari-3-1-branch.
+
+    2008-05-27  Timothy Hatcher  <timothy@apple.com>
+
+        Fixes a bug where unplugging the monitor from a video card and
+        moving it to another video card would no longer show OpenGL plugins
+        until you relaunched Safari.
+
+        <rdar://problem/5790983> Add AllowOfflineDisplays pixel format
+        attribute to OpenGL contexts
+
+        Reviewed by Kevin Decker.
+
+        * Plugins/WebBaseNetscapePluginView.mm:
+        (-[WebBaseNetscapePluginView _createWindowedAGLContext]): Added
+        AGL_ALLOW_OFFLINE_RENDERERS for non-Tiger builds.
+        (-[WebBaseNetscapePluginView _createWindowlessAGLContext]): Ditto.
+
 2008-03-24  Mark Rowe  <mrowe@apple.com>
 
         Merge the modifier key part of r31236 to Safari-3-1-branch.
diff --git a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
index 00a7b7d..97a6d69 100644
--- a/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
+++ b/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm
@@ -2810,6 +2810,9 @@
         AGL_DEPTH_SIZE, 32,
         AGL_WINDOW,
         AGL_ACCELERATED,
+#ifndef BUILDING_ON_TIGER
+        AGL_ALLOW_OFFLINE_RENDERERS,
+#endif
         0
     };
     
@@ -2875,6 +2878,9 @@
         AGL_ALPHA_SIZE, 8,
         AGL_DEPTH_SIZE, 32,
         AGL_OFFSCREEN,
+#ifndef BUILDING_ON_TIGER
+        AGL_ALLOW_OFFLINE_RENDERERS,
+#endif
         0
     };