diff --git a/ChangeLog b/ChangeLog
index 09f694c..cc3c454 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
+2007-03-11 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/x11/XGDragView.m (GSActionForDragOperation,
+	GSDragOperationForAction): Completed and corrected drag type
+	mapping between xdnd and OpenStep. NSDragOperationAll should now
+	be map back correctly when converted to xdnd and back again.
+
 2007-03-07 Xavier Glattard <xavier.glattard@online.fr>
 
+	* Source/win32/Event_format.sed,
+	* Source/win32/GSDisplayServer_details.m,
+	* Source/win32/RELEASE_NOTES,
+	* Source/win32/w32_config.h,
+	* Source/win32/w32_debug.m,
+	* Source/win32/w32_notifications.m: Delete files.
 	* Source/win32/WIN32Server.m (and other files):
 	Deletion of all non-GNUstep debug stuff (printf...)
 	Deletion of all Notification hooks (used for a debugging purpose)
@@ -15,6 +28,8 @@
 	+inializeBackend) and set an instance (not class) variable. 
 	Add methods -handlesWindowDecorations/-setHandlesWindowDecorations
 	Add methods -usesNativeTaskbar/-setUsesNativeTaskbar
+	* Source/win32/w32_GLcontext.m:
+	Fix a bug in OpenGL sub-window placement when handlesWindowDecorations == YES
 	
 2007-03-06 Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/x11/XGDragView.m b/Source/x11/XGDragView.m
index ba7e8fd..27d62ec 100644
--- a/Source/x11/XGDragView.m
+++ b/Source/x11/XGDragView.m
@@ -92,7 +92,7 @@ GSActionForDragOperation(unsigned int op)
 {
   Atom xaction;
   if (op == NSDragOperationAll)
-    xaction = dnd.XdndActionPrivate;
+    xaction = dnd.XdndActionAsk;
   else if (op & NSDragOperationCopy)
     xaction = dnd.XdndActionCopy;
   else if (op & NSDragOperationLink)
@@ -101,6 +101,8 @@ GSActionForDragOperation(unsigned int op)
     xaction = dnd.XdndActionCopy;
   else if (op & NSDragOperationPrivate)
     xaction = dnd.XdndActionPrivate;
+  else if (op & NSDragOperationMove)
+    xaction = dnd.XdndActionMove;
   else 
     xaction = None;
   return xaction;
@@ -114,11 +116,11 @@ GSDragOperationForAction(Atom xaction)
   if (xaction == dnd.XdndActionCopy)
     action = NSDragOperationCopy;
   else if (xaction == dnd.XdndActionMove)
-    action = NSDragOperationCopy;
+    action = NSDragOperationMove;
   else if (xaction == dnd.XdndActionLink) 
     action = NSDragOperationLink;
   else if (xaction == dnd.XdndActionAsk) 
-    action = NSDragOperationGeneric;
+    action = NSDragOperationAll;
   else if (xaction == dnd.XdndActionPrivate) 
     action = NSDragOperationPrivate;
   else