Index: /trunk/include/VBox/VBoxCrHgsmi.h
===================================================================
--- /trunk/include/VBox/VBoxCrHgsmi.h	(revision 33655)
+++ /trunk/include/VBox/VBoxCrHgsmi.h	(revision 33656)
@@ -9,4 +9,13 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
  */
 #ifndef ___VBoxCrHgsmi_h__
Index: /trunk/include/VBox/VBoxKeyboard.h
===================================================================
--- /trunk/include/VBox/VBoxKeyboard.h	(revision 33655)
+++ /trunk/include/VBox/VBoxKeyboard.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/include/VBox/VBoxUhgsmi.h
===================================================================
--- /trunk/include/VBox/VBoxUhgsmi.h	(revision 33655)
+++ /trunk/include/VBox/VBoxUhgsmi.h	(revision 33656)
@@ -9,4 +9,13 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
  */
 #ifndef ___VBoxUhgsmi_h__
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/cubetexture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/cubetexture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/cubetexture.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_main.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_main.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_main.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_private.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_private.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_private.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/device.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/device.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/device.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/directx.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/directx.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/directx.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/indexbuffer.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/indexbuffer.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/indexbuffer.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/pixelshader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/pixelshader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/pixelshader.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/surface.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/surface.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/surface.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/swapchain.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/swapchain.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/swapchain.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/texture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/texture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/texture.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/version.rc
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/version.rc	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/version.rc	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/vertexbuffer.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/vertexbuffer.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/vertexbuffer.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/vertexshader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/vertexshader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/vertexshader.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/volume.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/volume.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/volume.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/volumetexture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/volumetexture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/volumetexture.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/cubetexture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/cubetexture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/cubetexture.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_main.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_main.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_main.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_private.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_private.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_private.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/device.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/directx.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/directx.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/directx.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/indexbuffer.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/indexbuffer.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/indexbuffer.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/pixelshader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/pixelshader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/pixelshader.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/query.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/query.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/query.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/stateblock.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/stateblock.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/stateblock.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/surface.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/surface.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/surface.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/swapchain.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/swapchain.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/swapchain.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/texture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/texture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/texture.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/version.rc
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/version.rc	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/version.rc	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexbuffer.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexbuffer.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexbuffer.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexdeclaration.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexdeclaration.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexdeclaration.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexshader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexshader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/vertexshader.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volume.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volume.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volume.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volumetexture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volumetexture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/volumetexture.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/accctrl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/accctrl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/accctrl.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aclapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aclapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aclapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aclui.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aclui.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aclui.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activaut.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activaut.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activaut.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activdbg.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activdbg.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activdbg.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activscp.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activscp.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/activscp.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/adshlp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/adshlp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/adshlp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/advpub.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/advpub.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/advpub.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -25,4 +25,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #ifndef __WINE_ADVPUB_H
 #define __WINE_ADVPUB_H
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/amstream.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/amstream.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/amstream.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/amvideo.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/amvideo.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/amvideo.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/appmgmt.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/appmgmt.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/appmgmt.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/audevcod.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/audevcod.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/audevcod.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/austream.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/austream.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/austream.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aviriff.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aviriff.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/aviriff.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/axcore.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/axcore.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/axcore.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/axextend.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/axextend.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/axextend.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/basetsd.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/basetsd.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/basetsd.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/basetyps.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/basetyps.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/basetyps.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bcrypt.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bcrypt.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bcrypt.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bits.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bits.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bits.idl	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bits1_5.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bits1_5.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bits1_5.idl	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bitsmsg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bitsmsg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/bitsmsg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cderr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cderr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cderr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cfgmgr32.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cfgmgr32.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cfgmgr32.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cguid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cguid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cguid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cierror.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cierror.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cierror.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/clusapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/clusapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/clusapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/comcat.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/comcat.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/comcat.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/commctrl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/commctrl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/commctrl.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/commdlg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/commdlg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/commdlg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/compobj.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/compobj.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/compobj.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/control.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/control.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/control.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cor.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cor.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cor.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/corerror.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/corerror.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/corerror.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/corhdr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/corhdr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/corhdr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cpl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cpl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cpl.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cryptdlg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cryptdlg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cryptdlg.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -25,4 +25,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #ifndef __CRYPTDLG_H__
 #define __CRYPTDLG_H__
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cryptuiapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cryptuiapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cryptuiapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ctxtcall.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ctxtcall.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ctxtcall.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/custcntl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/custcntl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/custcntl.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cvconst.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cvconst.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/cvconst.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10effect.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10effect.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10effect.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10misc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10misc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10misc.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10shader.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10shader.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d10shader.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8caps.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8caps.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8caps.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8types.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8types.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d8types.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9caps.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9caps.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9caps.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9types.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9types.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3d9types.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dcaps.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dcaps.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dcaps.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dhal.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dhal.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dhal.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drm.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drmdef.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drmdef.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drmdef.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drmobj.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drmobj.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3drmobj.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dtypes.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dtypes.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dtypes.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8core.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8core.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8core.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8math.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8math.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8math.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8mesh.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8mesh.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx8mesh.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9core.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9core.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9core.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9math.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9math.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9math.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9mesh.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9mesh.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9mesh.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9shader.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9shader.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9shader.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9tex.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9tex.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/d3dx9tex.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbghelp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbghelp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbghelp.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbinit.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbinit.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbinit.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbprop.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbprop.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbprop.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbs.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbs.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbs.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbt.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbt.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dbt.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dciddi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dciddi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dciddi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dciman.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dciman.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dciman.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dde.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dde.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dde.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddeml.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddeml.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddeml.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/compstui.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/compstui.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/compstui.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/hidsdi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/hidsdi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/hidsdi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/imm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/imm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/imm.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/mountmgr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/mountmgr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/mountmgr.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddcdvd.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddcdvd.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddcdvd.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddk.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddk.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddk.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddser.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddser.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddser.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddtape.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddtape.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/ntddtape.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb100.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb100.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb100.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb200.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb200.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usb200.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usbdlib.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usbdlib.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/usbdlib.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/wdm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/wdm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/wdm.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/winddiui.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/winddiui.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/winddiui.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/winsplp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/winsplp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddk/winsplp.h	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddraw.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddraw.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddraw.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddrawgdi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddrawgdi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddrawgdi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddrawi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddrawi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddrawi.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddstream.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddstream.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ddstream.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/devenum.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/devenum.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/devenum.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/devguid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/devguid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/devguid.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/digitalv.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/digitalv.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/digitalv.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dimm.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dimm.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dimm.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dinput.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dinput.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dinput.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dispdib.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dispdib.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dispdib.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dispex.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dispex.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dispex.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dlgs.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dlgs.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dlgs.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dls1.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dls1.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dls1.h	(revision 33656)
@@ -17,12 +17,16 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
- 
+
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
  * that LGPLv2 or any later version may be used, or where a choice of which version
  * of the LGPL is applied is otherwise unspecified.
+ */
+
+ 
+/*
  */
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dls2.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dls2.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dls2.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmerror.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmerror.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmerror.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmo.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmo.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmo.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmoreg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmoreg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmoreg.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmort.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmort.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmort.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmplugin.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmplugin.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmplugin.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusbuff.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusbuff.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusbuff.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusicc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusicc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusicc.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusicf.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusicf.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusicf.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusici.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusici.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusici.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusics.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusics.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dmusics.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/docobj.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/docobj.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/docobj.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/downloadmgr.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/downloadmgr.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/downloadmgr.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dpaddr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dpaddr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dpaddr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplay.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplay.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplay.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplay8.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplay8.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplay8.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplobby.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplobby.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplobby.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplobby8.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplobby8.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dplobby8.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dpnathlp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dpnathlp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dpnathlp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsconf.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsconf.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsconf.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsdriver.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsdriver.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsdriver.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsgetdc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsgetdc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsgetdc.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dshow.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dshow.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dshow.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsound.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsound.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsound.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsrole.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsrole.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dsrole.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dvdmedia.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dvdmedia.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dvdmedia.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dwmapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dwmapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dwmapi.h	(revision 33656)
@@ -16,6 +16,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxdiag.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxdiag.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxdiag.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxerr8.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxerr8.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxerr8.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxerr9.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxerr9.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxerr9.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxfile.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxfile.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxfile.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxgi.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxgi.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxgi.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxgitype.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxgitype.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dxgitype.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dyngraph.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dyngraph.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/dyngraph.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/errorrep.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/errorrep.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/errorrep.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/errors.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/errors.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/errors.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/evcode.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/evcode.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/evcode.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/evntrace.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/evntrace.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/evntrace.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/excpt.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/excpt.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/excpt.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/exdisp.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/exdisp.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/exdisp.idl	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/exdispid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/exdispid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/exdispid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fci.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fci.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fci.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fdi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fdi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fdi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fusion.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fusion.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/fusion.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplus.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplus.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplus.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluscolor.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluscolor.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluscolor.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluscolormatrix.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluscolormatrix.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluscolormatrix.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusenums.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusenums.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusenums.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusflat.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusflat.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusflat.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusgpstubs.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusgpstubs.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusgpstubs.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusimaging.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusimaging.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusimaging.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusinit.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusinit.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusinit.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusmem.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusmem.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusmem.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusmetaheader.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusmetaheader.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplusmetaheader.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluspixelformats.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluspixelformats.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdipluspixelformats.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplustypes.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplustypes.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/gdiplustypes.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/guiddef.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/guiddef.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/guiddef.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/hlguids.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/hlguids.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/hlguids.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/hlink.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/hlink.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/hlink.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/htiframe.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/htiframe.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/htiframe.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/htmlhelp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/htmlhelp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/htmlhelp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/http.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/http.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/http.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/i_cryptasn1tls.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/i_cryptasn1tls.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/i_cryptasn1tls.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iads.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iads.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iads.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icftypes.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icftypes.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icftypes.idl	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icm.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icmpapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icmpapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/icmpapi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/idispids.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/idispids.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/idispids.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imagehlp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imagehlp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imagehlp.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imm.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imnact.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imnact.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imnact.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imnxport.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imnxport.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/imnxport.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/in6addr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/in6addr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/in6addr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/indexsrv.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/indexsrv.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/indexsrv.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/initguid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/initguid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/initguid.h	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/intshcut.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/intshcut.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/intshcut.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ipexport.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ipexport.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ipexport.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iphlpapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iphlpapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iphlpapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ipifcons.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ipifcons.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ipifcons.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iprtrmib.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iprtrmib.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iprtrmib.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iptypes.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iptypes.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/iptypes.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/isguids.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/isguids.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/isguids.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ks.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ks.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ks.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ksguid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ksguid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ksguid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ksmedia.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ksmedia.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ksmedia.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lm.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmaccess.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmaccess.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmaccess.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmapibuf.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmapibuf.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmapibuf.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmbrowsr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmbrowsr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmbrowsr.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmcons.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmcons.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmcons.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmerr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmerr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmerr.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmjoin.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmjoin.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmjoin.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmmsg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmmsg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmmsg.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmserver.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmserver.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmserver.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmshare.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmshare.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmshare.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmstats.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmstats.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmstats.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmuse.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmuse.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmuse.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmuseflg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmuseflg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmuseflg.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmwksta.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmwksta.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lmwksta.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/loadperf.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/loadperf.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/loadperf.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lzexpand.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lzexpand.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/lzexpand.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapicode.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapicode.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapicode.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapidefs.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapidefs.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapidefs.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiform.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiform.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiform.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiguid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiguid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiguid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapitags.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapitags.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapitags.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiutil.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiutil.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapiutil.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapival.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapival.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapival.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapix.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapix.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mapix.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mciavi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mciavi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mciavi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mcx.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mcx.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mcx.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mediaerr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mediaerr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mediaerr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mediaobj.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mediaobj.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mediaobj.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/midles.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/midles.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/midles.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mimeinfo.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mimeinfo.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mimeinfo.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mimeole.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mimeole.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mimeole.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/minmax.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/minmax.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/minmax.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mlang.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mlang.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mlang.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmddk.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmddk.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmddk.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmreg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmreg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmreg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmstream.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmstream.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmstream.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmsystem.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmsystem.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mmsystem.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mprapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mprapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mprapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacm.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacmdlg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacmdlg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacmdlg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacmdrv.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacmdrv.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msacmdrv.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mscat.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mscat.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mscat.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mscoree.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mscoree.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mscoree.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msctf.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msctf.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msctf.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmcid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmcid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmcid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmdid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmdid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmdid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmhst.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmhst.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtmhst.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtml.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtml.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mshtml.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msidefs.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msidefs.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msidefs.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msinkaut.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msinkaut.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msinkaut.idl	(revision 33656)
@@ -17,6 +17,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msiquery.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msiquery.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msiquery.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mssip.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mssip.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mssip.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mstask.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mstask.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mstask.idl	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mstcpip.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mstcpip.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mstcpip.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/crtdbg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/crtdbg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/crtdbg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/crtdefs.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/crtdefs.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/crtdefs.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/eh.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/eh.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/eh.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/errno.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/errno.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/errno.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/locale.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/locale.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/locale.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/malloc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/malloc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/malloc.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/mbctype.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/mbctype.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/mbctype.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/mbstring.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/mbstring.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/mbstring.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/search.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/search.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/search.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/setjmp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/setjmp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/setjmp.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/signal.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/signal.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/signal.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/stddef.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/stddef.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/stddef.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/locking.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/locking.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/locking.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/timeb.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/timeb.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/timeb.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/types.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/types.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/types.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/utime.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/utime.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/sys/utime.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/time.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/time.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/time.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/wctype.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/wctype.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msvcrt/wctype.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mswsock.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mswsock.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/mswsock.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml2.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml2.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml2.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml2did.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml2did.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxml2did.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxmldid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxmldid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/msxmldid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/nb30.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/nb30.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/nb30.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ndrtypes.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ndrtypes.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ndrtypes.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/netcon.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/netcon.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/netcon.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/netfw.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/netfw.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/netfw.idl	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/npapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/npapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/npapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/nspapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/nspapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/nspapi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddcdrm.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddcdrm.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddcdrm.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddndis.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddndis.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddndis.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddscsi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddscsi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddscsi.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddstor.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddstor.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntddstor.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntdsapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntdsapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntdsapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntquery.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntquery.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntquery.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntsecapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntsecapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntsecapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntsecpkg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntsecpkg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntsecpkg.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntstatus.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntstatus.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ntstatus.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oaidl.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oaidl.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oaidl.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objbase.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objbase.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objbase.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objidl.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objidl.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objidl.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objsafe.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objsafe.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/objsafe.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ocidl.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ocidl.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ocidl.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ocmm.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ocmm.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ocmm.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/odbcinst.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/odbcinst.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/odbcinst.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ole2.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ole2.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ole2.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ole2ver.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ole2ver.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ole2ver.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleacc.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleacc.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleacc.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleauto.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleauto.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleauto.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/olectl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/olectl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/olectl.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oledb.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oledb.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oledb.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oledlg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oledlg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oledlg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleidl.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleidl.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/oleidl.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/optary.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/optary.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/optary.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pdh.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pdh.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pdh.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pdhmsg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pdhmsg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pdhmsg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/perhist.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/perhist.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/perhist.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pktdef.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pktdef.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pktdef.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/poppack.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/poppack.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/poppack.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/powrprof.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/powrprof.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/powrprof.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/profinfo.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/profinfo.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/profinfo.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/propidl.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/propidl.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/propidl.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/propvarutil.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/propvarutil.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/propvarutil.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/prsht.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/prsht.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/prsht.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/psapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/psapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/psapi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack1.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack1.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack1.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack2.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack2.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack2.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack4.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack4.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack4.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack8.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack8.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pshpack8.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pstore.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pstore.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/pstore.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/qedit.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/qedit.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/qedit.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ras.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ras.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ras.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/raserror.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/raserror.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/raserror.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/reason.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/reason.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/reason.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/regstr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/regstr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/regstr.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/richedit.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/richedit.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/richedit.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/richole.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/richole.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/richole.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rmxfguid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rmxfguid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rmxfguid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpc.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcasync.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcasync.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcasync.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcdce.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcdce.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcdce.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcdcep.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcdcep.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcdcep.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcndr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcndr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcndr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcnterr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcnterr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcnterr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcproxy.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcproxy.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rpcproxy.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rtutils.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rtutils.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/rtutils.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/scarderr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/scarderr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/scarderr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schannel.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schannel.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schannel.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schemadef.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schemadef.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schemadef.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schnlsp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schnlsp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/schnlsp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sddl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sddl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sddl.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/secext.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/secext.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/secext.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/security.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/security.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/security.h	(revision 33656)
@@ -16,6 +16,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sensapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sensapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sensapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sensevts.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sensevts.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sensevts.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/servprov.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/servprov.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/servprov.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/setupapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/setupapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/setupapi.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sfc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sfc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sfc.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shdispid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shdispid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shdispid.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shellapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shellapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shellapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shldisp.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shldisp.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shldisp.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlguid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlguid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlguid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlobj.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlobj.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlobj.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlwapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlwapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shlwapi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shobjidl.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shobjidl.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shobjidl.idl	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shtypes.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shtypes.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/shtypes.idl	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sipbase.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sipbase.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sipbase.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/slerror.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/slerror.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/slerror.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/slpublic.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/slpublic.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/slpublic.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/snmp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/snmp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/snmp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/softpub.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/softpub.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/softpub.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sql.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sql.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sql.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sqlext.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sqlext.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sqlext.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sqltypes.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sqltypes.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sqltypes.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/srrestoreptapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/srrestoreptapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/srrestoreptapi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sspi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sspi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/sspi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/stdole2.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/stdole2.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/stdole2.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/storage.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/storage.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/storage.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/strmif.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/strmif.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/strmif.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/svrapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/svrapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/svrapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/t2embapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/t2embapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/t2embapi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tapi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tapi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tapi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tchar.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tchar.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tchar.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/textserv.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/textserv.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/textserv.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/textstor.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/textstor.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/textstor.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tlhelp32.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tlhelp32.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tlhelp32.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tmschema.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tmschema.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tmschema.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tom.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tom.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/tom.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/traffic.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/traffic.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/traffic.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/unknwn.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/unknwn.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/unknwn.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/urlhist.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/urlhist.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/urlhist.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/urlmon.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/urlmon.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/urlmon.idl	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/userenv.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/userenv.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/userenv.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/usp10.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/usp10.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/usp10.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/uuids.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/uuids.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/uuids.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/uxtheme.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/uxtheme.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/uxtheme.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vdmdbg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vdmdbg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vdmdbg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ver.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ver.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ver.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vfw.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vfw.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vfw.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vfwmsgs.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vfwmsgs.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vfwmsgs.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vmr9.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vmr9.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vmr9.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vmrender.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vmrender.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/vmrender.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wbemcli.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wbemcli.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wbemcli.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wfext.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wfext.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wfext.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winbase.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winbase.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winbase.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincodec.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincodec.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincodec.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincon.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincon.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincon.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincred.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincred.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincred.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincrypt.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincrypt.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wincrypt.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windef.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windef.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windef.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windns.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windns.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windns.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windows.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windows.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windows.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windowsx.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windowsx.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/windowsx.h	(revision 33656)
@@ -17,6 +17,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/dcetypes.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/dcetypes.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/dcetypes.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/debug.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/debug.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/debug.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/dplaysp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/dplaysp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/dplaysp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/epm.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/epm.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/epm.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/exception.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/irot.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/irot.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/irot.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/itss.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/itss.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/itss.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/library.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/library.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/library.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/list.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/list.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/list.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/mmsystem16.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/mmsystem16.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/mmsystem16.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/mscvpdb.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/mscvpdb.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/mscvpdb.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/port.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/port.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/port.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/pthread.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/pthread.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/pthread.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/rbtree.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/rbtree.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/rbtree.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/server.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/server.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/server.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/svcctl.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/svcctl.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/svcctl.idl	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/test.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/test.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/test.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/unicode.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/unicode.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/unicode.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wgl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wgl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wgl.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winaspi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winaspi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winaspi.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winbase16.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winbase16.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winbase16.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/windef16.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/windef16.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/windef16.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wine_common_ver.rc
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wine_common_ver.rc	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wine_common_ver.rc	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wined3d.idl	(revision 33656)
@@ -25,6 +25,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winedxgi.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winedxgi.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winedxgi.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wingdi16.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wingdi16.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wingdi16.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winnet16.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winnet16.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winnet16.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winuser16.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winuser16.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/winuser16.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wpp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wpp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wine/wpp.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winerror.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winerror.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winerror.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wingdi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wingdi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wingdi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winhttp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winhttp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winhttp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wininet.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wininet.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wininet.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winineti.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winineti.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winineti.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winioctl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winioctl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winioctl.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winldap.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winldap.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winldap.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnetwk.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnetwk.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnetwk.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnls.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnls.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnls.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnls32.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnls32.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnls32.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnt.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnt.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winnt.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winperf.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winperf.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winperf.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winreg.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winreg.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winreg.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winresrc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winresrc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winresrc.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsafer.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsafer.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsafer.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winscard.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winscard.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winscard.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsmcrd.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsmcrd.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsmcrd.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsock.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsock.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsock.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsock2.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsock2.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsock2.h	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winspool.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winspool.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winspool.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsvc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsvc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winsvc.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintab.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintab.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintab.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintabx.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintabx.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintabx.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winternl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winternl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winternl.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintrust.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintrust.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wintrust.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winuser.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winuser.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winuser.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winver.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winver.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/winver.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wmistr.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wmistr.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wmistr.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wnaspi32.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wnaspi32.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wnaspi32.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wownt32.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wownt32.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wownt32.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2def.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2def.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2def.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2ipdef.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2ipdef.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2ipdef.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2spi.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2spi.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2spi.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2tcpip.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2tcpip.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/ws2tcpip.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wshisotp.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wshisotp.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wshisotp.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wsipx.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wsipx.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wsipx.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wsnwlink.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wsnwlink.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wsnwlink.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wtsapi32.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wtsapi32.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wtsapi32.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wtypes.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wtypes.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wtypes.idl	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wuapi.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wuapi.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/wuapi.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xcmc.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xcmc.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xcmc.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xinput.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xinput.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xinput.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldom.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldom.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldom.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldomdid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldomdid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldomdid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldso.idl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldso.idl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldso.idl	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldsodid.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldsodid.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/xmldsodid.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/zmouse.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/zmouse.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/include/zmouse.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/config.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/config.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/config.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/cpmap.pl
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/cpmap.pl	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/cpmap.pl	(revision 33656)
@@ -20,11 +20,13 @@
 #
 
-#
-# Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
-# other than GPL or LGPL is available it will apply instead, Sun elects to use only
+
+# Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+# other than GPL or LGPL is available it will apply instead, Oracle elects to use only
 # the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
 # a choice of LGPL license versions is made available with the language indicating
 # that LGPLv2 or any later version may be used, or where a choice of which version
 # of the LGPL is applied is otherwise unspecified.
+
+#
 #
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/cptable.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/cptable.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/cptable.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/debug.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/debug.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/debug.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/fold.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/fold.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/fold.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/ldt.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/ldt.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/ldt.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/loader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/loader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/loader.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/mbtowc.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/mbtowc.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/mbtowc.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/mmap.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/mmap.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/mmap.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/port.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/port.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/port.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/sortkey.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/sortkey.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/sortkey.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #include "wine/unicode.h"
 
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/string.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/string.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/string.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/utf8.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/utf8.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/utf8.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/wctomb.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/wctomb.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/libWine/wctomb.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/arb_program_shader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/arb_program_shader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/arb_program_shader.c	(revision 33656)
@@ -29,6 +29,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/ati_fragment_shader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/ati_fragment_shader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/ati_fragment_shader.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/basetexture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/basetexture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/basetexture.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/buffer.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/buffer.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/buffer.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/clipper.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/clipper.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/clipper.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c	(revision 33656)
@@ -19,7 +19,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
+
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,5 +28,4 @@
  * of the LGPL is applied is otherwise unspecified.
  */
-
 
 #include "config.h"
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/cubetexture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/cubetexture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/cubetexture.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/device.c	(revision 33656)
@@ -28,6 +28,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/directx.c	(revision 33656)
@@ -25,6 +25,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/drawprim.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/drawprim.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/drawprim.c	(revision 33656)
@@ -26,6 +26,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/gl_compat.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/gl_compat.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/gl_compat.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/nvidia_texture_shader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/nvidia_texture_shader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/nvidia_texture_shader.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/palette.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/palette.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/palette.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/query.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/query.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/query.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/resource.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/resource.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/resource.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader_sm1.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader_sm1.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader_sm1.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader_sm4.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader_sm4.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/shader_sm4.c	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/state.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/state.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/state.c	(revision 33656)
@@ -27,6 +27,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/stateblock.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/stateblock.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/stateblock.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface.c	(revision 33656)
@@ -29,6 +29,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface_base.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface_base.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface_base.c	(revision 33656)
@@ -29,6 +29,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface_gdi.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface_gdi.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/surface_gdi.c	(revision 33656)
@@ -27,6 +27,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain_base.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain_base.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain_base.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain_gdi.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain_gdi.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/swapchain_gdi.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/texture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/texture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/texture.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/utils.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/utils.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/utils.c	(revision 33656)
@@ -26,6 +26,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vertexdeclaration.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vertexdeclaration.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/vertexdeclaration.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/view.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/view.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/view.c	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/volume.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/volume.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/volume.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/volumetexture.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/volumetexture.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/volumetexture.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_gl.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_gl.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_gl.h	(revision 33656)
@@ -45,6 +45,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_main.c
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_main.c	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_main.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private_types.h
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private_types.h	(revision 33655)
+++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private_types.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/DRM/Makefile.kmk	(revision 33656)
@@ -14,4 +14,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c
===================================================================
--- /trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c	(revision 33656)
@@ -14,4 +14,13 @@
  * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ *
+ * The contents of this file may alternatively be used under the terms
+ * of the Common Development and Distribution License Version 1.0
+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+ * VirtualBox OSE distribution, in which case the provisions of the
+ * CDDL are applicable instead of those of the GPL.
+ *
+ * You may elect to license modified versions of this file under the
+ * terms and conditions of either the GPL or the CDDL or both.
  */
 
Index: /trunk/src/VBox/Additions/solaris/Installer/VBox.sh
===================================================================
--- /trunk/src/VBox/Additions/solaris/Installer/VBox.sh	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/Installer/VBox.sh	(revision 33656)
@@ -12,4 +12,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/solaris/Installer/makepackage.sh
===================================================================
--- /trunk/src/VBox/Additions/solaris/Installer/makepackage.sh	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/Installer/makepackage.sh	(revision 33656)
@@ -12,4 +12,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/solaris/Installer/postinstall.sh
===================================================================
--- /trunk/src/VBox/Additions/solaris/Installer/postinstall.sh	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/Installer/postinstall.sh	(revision 33656)
@@ -12,4 +12,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/solaris/Installer/preremove.sh
===================================================================
--- /trunk/src/VBox/Additions/solaris/Installer/preremove.sh	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/Installer/preremove.sh	(revision 33656)
@@ -12,4 +12,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/solaris/Installer/vboxguest.sh
===================================================================
--- /trunk/src/VBox/Additions/solaris/Installer/vboxguest.sh	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/Installer/vboxguest.sh	(revision 33656)
@@ -12,4 +12,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/solaris/Installer/vboxservice.xml
===================================================================
--- /trunk/src/VBox/Additions/solaris/Installer/vboxservice.xml	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/Installer/vboxservice.xml	(revision 33656)
@@ -13,4 +13,13 @@
      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+
+     The contents of this file may alternatively be used under the terms
+     of the Common Development and Distribution License Version 1.0
+     (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+     VirtualBox OSE distribution, in which case the provisions of the
+     CDDL are applicable instead of those of the GPL.
+
+     You may elect to license modified versions of this file under the
+     terms and conditions of either the GPL or the CDDL or both.
 -->
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
Index: /trunk/src/VBox/Additions/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/Makefile.kmk	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/Makefile.kmk	(revision 33656)
@@ -14,4 +14,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk	(revision 33655)
+++ /trunk/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk	(revision 33656)
@@ -14,4 +14,13 @@
 # VirtualBox OSE distribution. VirtualBox OSE is distributed in the
 # hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+#
+# The contents of this file may alternatively be used under the terms
+# of the Common Development and Distribution License Version 1.0
+# (CDDL) only, as it comes in the "COPYING.CDDL" file of the
+# VirtualBox OSE distribution, in which case the provisions of the
+# CDDL are applicable instead of those of the GPL.
+#
+# You may elect to license modified versions of this file under the
+# terms and conditions of either the GPL or the CDDL or both.
 #
 
Index: /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.8.0/parser.h
===================================================================
--- /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.8.0/parser.h	(revision 33655)
+++ /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.8.0/parser.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/Graphics/BIOS/clext.c
===================================================================
--- /trunk/src/VBox/Devices/Graphics/BIOS/clext.c	(revision 33655)
+++ /trunk/src/VBox/Devices/Graphics/BIOS/clext.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -28,4 +28,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 //#define CIRRUS_VESA3_PMINFO
 #ifdef VBE
Index: /trunk/src/VBox/Devices/Graphics/BIOS/vbe.c
===================================================================
--- /trunk/src/VBox/Devices/Graphics/BIOS/vbe.c	(revision 33655)
+++ /trunk/src/VBox/Devices/Graphics/BIOS/vbe.c	(revision 33656)
@@ -31,6 +31,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/Graphics/BIOS/vgabios.c
===================================================================
--- /trunk/src/VBox/Devices/Graphics/BIOS/vgabios.c	(revision 33655)
+++ /trunk/src/VBox/Devices/Graphics/BIOS/vgabios.c	(revision 33656)
@@ -51,6 +51,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/BIOS/rombios.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/rombios.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/BIOS/rombios.c	(revision 33656)
@@ -27,6 +27,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -34,4 +34,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 // ROM BIOS for use with Bochs/Plex86/QEMU emulation environment
 
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/core/i386_timer.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/core/i386_timer.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/core/i386_timer.c	(revision 33656)
@@ -9,6 +9,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h	(revision 33656)
@@ -18,6 +18,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/config.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/config.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/config.c	(revision 33656)
@@ -7,6 +7,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c	(revision 33656)
@@ -37,6 +37,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/isa_probe.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/isa_probe.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/isa_probe.c	(revision 33656)
@@ -8,6 +8,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/isapnp.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/isapnp.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/isapnp.c	(revision 33656)
@@ -29,6 +29,9 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ */
+
+/*
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
@@ -36,4 +39,5 @@
  * of the GPL is applied is otherwise unspecified.
  */
+
 *    Version 0.3 Sept 23, 2003	timlegge Change delay to currticks
 *		
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/osloader.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/osloader.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/osloader.c	(revision 33656)
@@ -31,6 +31,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/pci.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/pci.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/pci.c	(revision 33656)
@@ -9,6 +9,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/pci_probe.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/pci_probe.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/pci_probe.c	(revision 33656)
@@ -8,6 +8,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/proto_tftm.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/proto_tftm.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/proto_tftm.c	(revision 33656)
@@ -33,6 +33,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/core/timer.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/core/timer.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/core/timer.c	(revision 33656)
@@ -9,6 +9,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/drivers/net/pcnet32.c
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/drivers/net/pcnet32.c	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/drivers/net/pcnet32.c	(revision 33656)
@@ -41,6 +41,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/include/isapnp.h
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/include/isapnp.h	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/include/isapnp.h	(revision 33656)
@@ -29,6 +29,9 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ */
+
+/*
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
@@ -36,4 +39,5 @@
  * of the GPL is applied is otherwise unspecified.
  */
+
 *
 ***************************************************************************/
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/include/nic.h
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/include/nic.h	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/include/nic.h	(revision 33656)
@@ -7,6 +7,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/include/pci.h
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/include/pci.h	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/include/pci.h	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Devices/PC/Etherboot-src/include/timer.h
===================================================================
--- /trunk/src/VBox/Devices/PC/Etherboot-src/include/timer.h	(revision 33655)
+++ /trunk/src/VBox/Devices/PC/Etherboot-src/include/timer.h	(revision 33656)
@@ -9,6 +9,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-layouts.h
===================================================================
--- /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-layouts.h	(revision 33655)
+++ /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-layouts.h	(revision 33656)
@@ -28,6 +28,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-list.h
===================================================================
--- /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-list.h	(revision 33655)
+++ /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-list.h	(revision 33656)
@@ -25,6 +25,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h
===================================================================
--- /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h	(revision 33655)
+++ /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-tables.h	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h
===================================================================
--- /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h	(revision 33655)
+++ /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard-types.h	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c
===================================================================
--- /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c	(revision 33655)
+++ /trunk/src/VBox/Frontends/Common/VBoxKeyboard/keyboard.c	(revision 33656)
@@ -32,6 +32,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIWindowMenuManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIWindowMenuManager.cpp	(revision 33655)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/darwin/UIWindowMenuManager.cpp	(revision 33656)
@@ -10,4 +10,10 @@
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  * available from hm_regWindowsp://www.virtualbox.org. This file is free software;
  * you can redistribute it and/or modify it under the terms of the GNU
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp	(revision 33655)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp	(revision 33656)
@@ -9,11 +9,6 @@
  * Copyright (C) 2006-2010 Oracle Corporation
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ * Oracle Corporation confidential
+ * All rights reserved
  */
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage3.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage3.ui	(revision 33655)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIExportApplianceWzdPage3.ui	(revision 33656)
@@ -10,5 +10,5 @@
      you can redistribute it and/or modify it under the terms of the GNU
      General Public License (GPL) as published by the Free Software
-     Foundation, in version 2 as it comes in the &quot;COPYING&quot; file of the
+     Foundation, in version 2 as it comes in the "COPYING" file of the
      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage2.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage2.ui	(revision 33655)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage2.ui	(revision 33656)
@@ -10,5 +10,5 @@
      you can redistribute it and/or modify it under the terms of the GNU
      General Public License (GPL) as published by the Free Software
-     Foundation, in version 2 as it comes in the &quot;COPYING&quot; file of the
+     Foundation, in version 2 as it comes in the "COPYING" file of the
      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage3.ui
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage3.ui	(revision 33655)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIFirstRunWzdPage3.ui	(revision 33656)
@@ -10,5 +10,5 @@
      you can redistribute it and/or modify it under the terms of the GNU
      General Public License (GPL) as published by the Free Software
-     Foundation, in version 2 as it comes in the &quot;COPYING&quot; file of the
+     Foundation, in version 2 as it comes in the "COPYING" file of the
      VirtualBox OSE distribution. VirtualBox OSE is distributed in the
      hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
Index: /trunk/src/VBox/Main/ExtPackUtil.cpp
===================================================================
--- /trunk/src/VBox/Main/ExtPackUtil.cpp	(revision 33655)
+++ /trunk/src/VBox/Main/ExtPackUtil.cpp	(revision 33656)
@@ -7,11 +7,6 @@
  * Copyright (C) 2010 Oracle Corporation
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ * Oracle Corporation confidential
+ * All rights reserved
  */
 
Index: /trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp
===================================================================
--- /trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp	(revision 33655)
+++ /trunk/src/VBox/Main/VBoxExtPackHelperApp.cpp	(revision 33656)
@@ -7,11 +7,6 @@
  * Copyright (C) 2010 Oracle Corporation
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ * Oracle Corporation confidential
+ * All rights reserved
  */
 
Index: /trunk/src/VBox/Main/include/ExtPackUtil.h
===================================================================
--- /trunk/src/VBox/Main/include/ExtPackUtil.h	(revision 33655)
+++ /trunk/src/VBox/Main/include/ExtPackUtil.h	(revision 33656)
@@ -7,11 +7,6 @@
  * Copyright (C) 2010 Oracle Corporation
  *
- * This file is part of VirtualBox Open Source Edition (OSE), as
- * available from http://www.virtualbox.org. This file is free software;
- * you can redistribute it and/or modify it under the terms of the GNU
- * General Public License (GPL) as published by the Free Software
- * Foundation, in version 2 as it comes in the "COPYING" file of the
- * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
- * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ * Oracle Corporation confidential
+ * All rights reserved
  */
 
Index: /trunk/src/VBox/Main/webservice/websrv-php.xsl
===================================================================
--- /trunk/src/VBox/Main/webservice/websrv-php.xsl	(revision 33655)
+++ /trunk/src/VBox/Main/webservice/websrv-php.xsl	(revision 33656)
@@ -12,5 +12,5 @@
      Contributed by James Lucas (mjlucas at eng.uts.edu.au).
 
-     Copyright (C) 2009-2010 Oracle Corporation
+     Copyright (C) 2008-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd	(revision 33655)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-common.xsd	(revision 33656)
@@ -7,5 +7,5 @@
  *  Common definitions
 
-     Copyright (C) 2004-2009 Oracle Corporation
+     Copyright (C) 2004-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-freebsd.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-freebsd.xsd	(revision 33655)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-freebsd.xsd	(revision 33656)
@@ -6,5 +6,5 @@
  *  Oracle VM VirtualBox Settings Schema Version 1.0-freebsd
 
-     Copyright (C) 2004-2009 Oracle Corporation
+     Copyright (C) 2004-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-linux.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-linux.xsd	(revision 33655)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-linux.xsd	(revision 33656)
@@ -6,5 +6,5 @@
  *  Oracle VM VirtualBox Settings Schema Version 1.0-linux
 
-     Copyright (C) 2004-2009 Oracle Corporation
+     Copyright (C) 2004-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd	(revision 33655)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd	(revision 33656)
@@ -6,5 +6,5 @@
  *  Oracle VM VirtualBox Settings Schema Version 1.0-macosx
 
-     Copyright (C) 2004-2009 Oracle Corporation
+     Copyright (C) 2004-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-os2.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-os2.xsd	(revision 33655)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-os2.xsd	(revision 33656)
@@ -7,5 +7,5 @@
  *  Oracle VM VirtualBox Settings Schema Version 1.0-os2
  *
-     Copyright (C) 2004-2009 Oracle Corporation
+     Copyright (C) 2004-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd	(revision 33655)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd	(revision 33656)
@@ -6,5 +6,5 @@
  *  Oracle VM VirtualBox Settings Schema Version 1.0-solaris
 
-     Copyright (C) 2004-2009 Oracle Corporation
+     Copyright (C) 2004-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/Main/xml/VirtualBox-settings-windows.xsd
===================================================================
--- /trunk/src/VBox/Main/xml/VirtualBox-settings-windows.xsd	(revision 33655)
+++ /trunk/src/VBox/Main/xml/VirtualBox-settings-windows.xsd	(revision 33656)
@@ -6,5 +6,5 @@
  *  Oracle VM VirtualBox Settings Schema Version 1.0-windows
 
-     Copyright (C) 2004-2009 Oracle Corporation
+     Copyright (C) 2004-2010 Oracle Corporation
 
      This file is part of VirtualBox Open Source Edition (OSE), as
Index: /trunk/src/VBox/RDP/client/bitmap.c
===================================================================
--- /trunk/src/VBox/RDP/client/bitmap.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/bitmap.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/cache.c
===================================================================
--- /trunk/src/VBox/RDP/client/cache.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/cache.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/channels.c
===================================================================
--- /trunk/src/VBox/RDP/client/channels.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/channels.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/cliprdr.c
===================================================================
--- /trunk/src/VBox/RDP/client/cliprdr.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/cliprdr.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/constants.h
===================================================================
--- /trunk/src/VBox/RDP/client/constants.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/constants.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/disk.c
===================================================================
--- /trunk/src/VBox/RDP/client/disk.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/disk.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/disk.h
===================================================================
--- /trunk/src/VBox/RDP/client/disk.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/disk.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/ewmhints.c
===================================================================
--- /trunk/src/VBox/RDP/client/ewmhints.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/ewmhints.c	(revision 33656)
@@ -24,6 +24,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/iso.c
===================================================================
--- /trunk/src/VBox/RDP/client/iso.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/iso.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/licence.c
===================================================================
--- /trunk/src/VBox/RDP/client/licence.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/licence.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/lspci.c
===================================================================
--- /trunk/src/VBox/RDP/client/lspci.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/lspci.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/mcs.c
===================================================================
--- /trunk/src/VBox/RDP/client/mcs.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/mcs.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/mppc.c
===================================================================
--- /trunk/src/VBox/RDP/client/mppc.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/mppc.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/orders.c
===================================================================
--- /trunk/src/VBox/RDP/client/orders.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/orders.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/orders.h
===================================================================
--- /trunk/src/VBox/RDP/client/orders.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/orders.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/parallel.c
===================================================================
--- /trunk/src/VBox/RDP/client/parallel.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/parallel.c	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
@@ -26,4 +26,5 @@
  * of the GPL is applied is otherwise unspecified.
  */
+
 #define	MAX_PARALLEL_DEVICES		1
 
Index: /trunk/src/VBox/RDP/client/parse.h
===================================================================
--- /trunk/src/VBox/RDP/client/parse.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/parse.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/printer.c
===================================================================
--- /trunk/src/VBox/RDP/client/printer.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/printer.c	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/printercache.c
===================================================================
--- /trunk/src/VBox/RDP/client/printercache.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/printercache.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/proto.h
===================================================================
--- /trunk/src/VBox/RDP/client/proto.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/proto.h	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/pstcache.c
===================================================================
--- /trunk/src/VBox/RDP/client/pstcache.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/pstcache.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdesktop.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdesktop.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdesktop.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdesktop.h
===================================================================
--- /trunk/src/VBox/RDP/client/rdesktop.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdesktop.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdp.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdp.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdp.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdp5.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdp5.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdp5.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpdr.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpdr.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpdr.c	(revision 33656)
@@ -19,6 +19,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd.h
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd_alsa.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd_alsa.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd_alsa.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd_dsp.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd_dsp.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd_dsp.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd_dsp.h
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd_dsp.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd_dsp.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd_libao.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd_libao.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd_libao.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd_oss.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd_oss.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd_oss.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd_sgi.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd_sgi.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd_sgi.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/rdpsnd_sun.c
===================================================================
--- /trunk/src/VBox/RDP/client/rdpsnd_sun.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/rdpsnd_sun.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/scard.c
===================================================================
--- /trunk/src/VBox/RDP/client/scard.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/scard.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/scard.h
===================================================================
--- /trunk/src/VBox/RDP/client/scard.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/scard.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/seamless.c
===================================================================
--- /trunk/src/VBox/RDP/client/seamless.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/seamless.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/secure.c
===================================================================
--- /trunk/src/VBox/RDP/client/secure.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/secure.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/serial.c
===================================================================
--- /trunk/src/VBox/RDP/client/serial.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/serial.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the GPL is applied is otherwise unspecified.
  */
+
 #include <unistd.h>
 #include <fcntl.h>
Index: /trunk/src/VBox/RDP/client/ssl.c
===================================================================
--- /trunk/src/VBox/RDP/client/ssl.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/ssl.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/ssl.h
===================================================================
--- /trunk/src/VBox/RDP/client/ssl.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/ssl.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/tcp.c
===================================================================
--- /trunk/src/VBox/RDP/client/tcp.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/tcp.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/types.h
===================================================================
--- /trunk/src/VBox/RDP/client/types.h	(revision 33655)
+++ /trunk/src/VBox/RDP/client/types.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/xclip.c
===================================================================
--- /trunk/src/VBox/RDP/client/xclip.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/xclip.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/xkeymap.c
===================================================================
--- /trunk/src/VBox/RDP/client/xkeymap.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/xkeymap.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/VBox/RDP/client/xwin.c
===================================================================
--- /trunk/src/VBox/RDP/client/xwin.c	(revision 33655)
+++ /trunk/src/VBox/RDP/client/xwin.c	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/libs/libxml2-2.6.30/ltmain.sh
===================================================================
--- /trunk/src/libs/libxml2-2.6.30/ltmain.sh	(revision 33655)
+++ /trunk/src/libs/libxml2-2.6.30/ltmain.sh	(revision 33656)
@@ -26,10 +26,11 @@
 
 
-# Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
-# other than GPL or LGPL is available it will apply instead, Sun elects to use only
+# Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+# other than GPL or LGPL is available it will apply instead, Oracle elects to use only
 # the General Public License version 2 (GPLv2) at this time for any software where
 # a choice of GPL license versions is made available with the language indicating
 # that GPLv2 or any later version may be used, or where a choice of which version
 # of the GPL is applied is otherwise unspecified.
+
 basename="s,^.*/,,g"
 
Index: /trunk/src/libs/libxslt-1.1.22/doc/tutorial/libxslt_tutorial.c
===================================================================
--- /trunk/src/libs/libxslt-1.1.22/doc/tutorial/libxslt_tutorial.c	(revision 33655)
+++ /trunk/src/libs/libxslt-1.1.22/doc/tutorial/libxslt_tutorial.c	(revision 33656)
@@ -23,6 +23,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/libs/libxslt-1.1.22/doc/tutorial2/libxslt_pipes.c
===================================================================
--- /trunk/src/libs/libxslt-1.1.22/doc/tutorial2/libxslt_pipes.c	(revision 33655)
+++ /trunk/src/libs/libxslt-1.1.22/doc/tutorial2/libxslt_pipes.c	(revision 33656)
@@ -22,6 +22,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
Index: /trunk/src/libs/libxslt-1.1.22/ltmain.sh
===================================================================
--- /trunk/src/libs/libxslt-1.1.22/ltmain.sh	(revision 33655)
+++ /trunk/src/libs/libxslt-1.1.22/ltmain.sh	(revision 33656)
@@ -26,10 +26,11 @@
 
 
-# Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
-# other than GPL or LGPL is available it will apply instead, Sun elects to use only
+# Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+# other than GPL or LGPL is available it will apply instead, Oracle elects to use only
 # the General Public License version 2 (GPLv2) at this time for any software where
 # a choice of GPL license versions is made available with the language indicating
 # that GPLv2 or any later version may be used, or where a choice of which version
 # of the GPL is applied is otherwise unspecified.
+
 basename="s,^.*/,,g"
 
Index: /trunk/src/recompiler/cpu-all.h
===================================================================
--- /trunk/src/recompiler/cpu-all.h	(revision 33655)
+++ /trunk/src/recompiler/cpu-all.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #ifndef CPU_ALL_H
 #define CPU_ALL_H
Index: /trunk/src/recompiler/cpu-defs.h
===================================================================
--- /trunk/src/recompiler/cpu-defs.h	(revision 33655)
+++ /trunk/src/recompiler/cpu-defs.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #ifndef CPU_DEFS_H
 #define CPU_DEFS_H
Index: /trunk/src/recompiler/cpu-exec.c
===================================================================
--- /trunk/src/recompiler/cpu-exec.c	(revision 33655)
+++ /trunk/src/recompiler/cpu-exec.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #include "config.h"
 #define CPU_NO_GLOBAL_REGS
Index: /trunk/src/recompiler/dyngen-exec.h
===================================================================
--- /trunk/src/recompiler/dyngen-exec.h	(revision 33655)
+++ /trunk/src/recompiler/dyngen-exec.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #if !defined(__DYNGEN_EXEC_H__)
 #define __DYNGEN_EXEC_H__
Index: /trunk/src/recompiler/exec-all.h
===================================================================
--- /trunk/src/recompiler/exec-all.h	(revision 33655)
+++ /trunk/src/recompiler/exec-all.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/recompiler/exec.c
===================================================================
--- /trunk/src/recompiler/exec.c	(revision 33655)
+++ /trunk/src/recompiler/exec.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #include "config.h"
 #ifndef VBOX
Index: /trunk/src/recompiler/hostregs_helper.h
===================================================================
--- /trunk/src/recompiler/hostregs_helper.h	(revision 33655)
+++ /trunk/src/recompiler/hostregs_helper.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/recompiler/qemu-lock.h
===================================================================
--- /trunk/src/recompiler/qemu-lock.h	(revision 33655)
+++ /trunk/src/recompiler/qemu-lock.h	(revision 33656)
@@ -16,7 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -24,5 +25,4 @@
  * of the LGPL is applied is otherwise unspecified.
  */
-
 
 /* Locking primitives.  Most of this code should be redundant -
Index: /trunk/src/recompiler/softmmu_header.h
===================================================================
--- /trunk/src/recompiler/softmmu_header.h	(revision 33655)
+++ /trunk/src/recompiler/softmmu_header.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #if DATA_SIZE == 8
 #define SUFFIX q
Index: /trunk/src/recompiler/softmmu_template.h
===================================================================
--- /trunk/src/recompiler/softmmu_template.h	(revision 33655)
+++ /trunk/src/recompiler/softmmu_template.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #define DATA_SIZE (1 << SHIFT)
 
Index: /trunk/src/recompiler/target-i386/cpu.h
===================================================================
--- /trunk/src/recompiler/target-i386/cpu.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/cpu.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #ifndef CPU_I386_H
 #define CPU_I386_H
Index: /trunk/src/recompiler/target-i386/exec.h
===================================================================
--- /trunk/src/recompiler/target-i386/exec.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/exec.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #include "config.h"
 #include "dyngen-exec.h"
Index: /trunk/src/recompiler/target-i386/helper.c
===================================================================
--- /trunk/src/recompiler/target-i386/helper.c	(revision 33655)
+++ /trunk/src/recompiler/target-i386/helper.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #include <stdarg.h>
 #include <stdlib.h>
Index: /trunk/src/recompiler/target-i386/helper_template.h
===================================================================
--- /trunk/src/recompiler/target-i386/helper_template.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/helper_template.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #define DATA_BITS (1 << (3 + SHIFT))
 #define SHIFT_MASK (DATA_BITS - 1)
Index: /trunk/src/recompiler/target-i386/op_helper.c
===================================================================
--- /trunk/src/recompiler/target-i386/op_helper.c	(revision 33655)
+++ /trunk/src/recompiler/target-i386/op_helper.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #define CPU_NO_GLOBAL_REGS
 #include "exec.h"
Index: /trunk/src/recompiler/target-i386/opreg_template.h
===================================================================
--- /trunk/src/recompiler/target-i386/opreg_template.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/opreg_template.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -28,4 +28,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 void OPPROTO glue(op_movl_A0,REGNAME)(void)
 {
Index: /trunk/src/recompiler/target-i386/ops_sse.h
===================================================================
--- /trunk/src/recompiler/target-i386/ops_sse.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/ops_sse.h	(revision 33656)
@@ -19,7 +19,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
Index: /trunk/src/recompiler/target-i386/ops_sse_header.h
===================================================================
--- /trunk/src/recompiler/target-i386/ops_sse_header.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/ops_sse_header.h	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #if SHIFT == 0
 #define Reg MMXReg
Index: /trunk/src/recompiler/target-i386/ops_template.h
===================================================================
--- /trunk/src/recompiler/target-i386/ops_template.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/ops_template.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -28,4 +28,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #define DATA_BITS (1 << (3 + SHIFT))
 #define SHIFT_MASK (DATA_BITS - 1)
Index: /trunk/src/recompiler/target-i386/ops_template_mem.h
===================================================================
--- /trunk/src/recompiler/target-i386/ops_template_mem.h	(revision 33655)
+++ /trunk/src/recompiler/target-i386/ops_template_mem.h	(revision 33656)
@@ -21,6 +21,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -28,4 +28,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #ifdef MEM_WRITE
 
Index: /trunk/src/recompiler/target-i386/translate.c
===================================================================
--- /trunk/src/recompiler/target-i386/translate.c	(revision 33655)
+++ /trunk/src/recompiler/target-i386/translate.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #include <stdarg.h>
 #include <stdlib.h>
Index: /trunk/src/recompiler/tests/linux-test.c
===================================================================
--- /trunk/src/recompiler/tests/linux-test.c	(revision 33655)
+++ /trunk/src/recompiler/tests/linux-test.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the GPL is applied is otherwise unspecified.
  */
+
 #include <stdarg.h>
 #include <stdlib.h>
Index: /trunk/src/recompiler/tests/test-i386.c
===================================================================
--- /trunk/src/recompiler/tests/test-i386.c	(revision 33655)
+++ /trunk/src/recompiler/tests/test-i386.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun GPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the General Public License version 2 (GPLv2) at this time for any software where
  * a choice of GPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the GPL is applied is otherwise unspecified.
  */
+
 #define _GNU_SOURCE
 #include <stdlib.h>
Index: /trunk/src/recompiler/translate-all.c
===================================================================
--- /trunk/src/recompiler/translate-all.c	(revision 33655)
+++ /trunk/src/recompiler/translate-all.c	(revision 33656)
@@ -20,6 +20,6 @@
 
 /*
- * Sun LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
- * other than GPL or LGPL is available it will apply instead, Sun elects to use only
+ * Oracle LGPL Disclaimer: For the avoidance of doubt, except that if any license choice
+ * other than GPL or LGPL is available it will apply instead, Oracle elects to use only
  * the Lesser General Public License version 2.1 (LGPLv2) at this time for any software where
  * a choice of LGPL license versions is made available with the language indicating
@@ -27,4 +27,5 @@
  * of the LGPL is applied is otherwise unspecified.
  */
+
 #include <stdarg.h>
 #include <stdlib.h>
