Index: /trunk/COPYING
===================================================================
--- /trunk/COPYING	(revision 35196)
+++ /trunk/COPYING	(revision 35197)
@@ -1,23 +1,37 @@
-The majority of code in VirtualBox Open Source Edition (OSE) is
-copyrighted by Oracle Corporation. This code is combined with
-third-party code that was originally released under the Apache
-License 2.0, the OpenSSL license, the Mozilla Public License (MPL)
-and the Slirp license, all of which the Free Software Foundation
-considers to be incompatible with the GPL, as well as the X11, zlib,
-liblzf and LGPL licenses. As a special exception to the terms and
-conditions of the GPL listed below, Sun gives you explicit
-permission to combine its GPL code contained in VirtualBox OSE with
-third-party code under the aforementioned licenses. You may copy
-and distribute such a combination provided that you adhere to the
-terms and conditions of all of the GPL and the licenses of the
-third-party code; in particular, you must include the source code of
-the entire combination insofar as the GPL requires distribution of
-source code.
-
-Note that whoever creates or distributes a derived work based on
-VirtualBox OSE is not obligated to grant this special exception for
-such a version. The GPL allows for releasing a modified version
-without the above exception; Sun also allows you to release a modified
-version which carries forward this exception.
+Preliminary notes:
+
+1) The majority of code in the VirtualBox Open Source Edition (OSE) is
+copyrighted by Oracle Corporation. This code is combined with third-party code
+that was originally released under licenses which the Free Software Foundation
+considers incompatible with the GPL, such as the Apache License 2.0, the OpenSSL
+license, the Mozilla Public License (MPL) and the Slirp license. (Please see the
+VirtualBox User Manual for a complete list of third-party code and their
+licenses.) As a special exception to the terms and conditions of the GPL listed
+below, Oracle gives you explicit permission to combine its GPL code contained in
+VirtualBox OSE with third-party code under the aforementioned licenses. You may
+copy and distribute such a combination provided that you adhere to the terms and
+conditions of all of the GPL and the licenses of the third-party code; in
+particular, you must include the source code of the entire combination insofar
+as the GPL requires distribution of source code.
+
+2) The GPL listed below does not bind software which uses VirtualBox services by
+merely linking to VirtualBox libraries so long as all VirtualBox interfaces used
+by that software are multi-licensed. A VirtualBox interface is deemed
+multi-licensed if it is declared in a VirtualBox header file that is licensed
+under both the GPL version 2 (below) *and* the Common Development and
+Distribution License Version 1.0 (CDDL), as it comes in the "COPYING.CDDL" file.
+In other words, calling such a multi-licensed interface is merely considered
+normal use of VirtualBox and does not turn the calling code into a derived work
+of VirtualBox. In particular, this applies to code that wants to extend
+VirtualBox by way of the Extension Pack mechanism declared in the ExtPack.h
+header file.
+
+3) Whoever creates or distributes a derived work based on VirtualBox OSE is not
+obligated to grant the above exceptions for such a version. The GPL allows for
+releasing a modified version without the above exception; in addition, Oracle
+hereby also allows you to release a modified version which carries forward these
+exceptions.
+
+Oracle Corporation
 
 ---
@@ -81,5 +95,4 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
-
 
 		    GNU GENERAL PUBLIC LICENSE
@@ -138,5 +151,4 @@
     the Program is not required to print an announcement.)
 
-
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
@@ -196,5 +208,4 @@
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
 
   4. You may not copy, modify, sublicense, or distribute the Program
@@ -255,5 +266,4 @@
 be a consequence of the rest of this License.
 
-
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
@@ -309,5 +319,4 @@
 		     END OF TERMS AND CONDITIONS
 
-
 	    How to Apply These Terms to Your New Programs
 
@@ -336,5 +345,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+USA