--- gpl-draft-2007-03-28.txt	2007-03-31 23:34:20.000000000 +0200
+++ gpl-draft-2007-03-28-al-compat.txt	2007-03-31 23:58:26.000000000 +0200
@@ -367,7 +367,7 @@
 drafted for compatibility with, local law:
 
   a. disclaiming warranty or limiting liability differently from the
-  terms of section 15 of this License; or
+  terms of section 16 of this License; or
 
   b. requiring preservation of specified reasonable legal notices or
   author attributions in source or object code forms of material added
@@ -529,7 +529,15 @@
 covered work but will not apply to the work with which it is linked,
 which will remain governed by the Affero General Public License.
 
-  14.[9] Revised Versions of this License.
+  14. Use with the Apache Software License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link any covered work with a work licensed under version
+2 of the Apache Software License, and to convey the resulting
+combination.  The terms of this License will continue to apply to your
+covered work.
+
+  15.[9] Revised Versions of this License.
 
   The Free Software Foundation may publish revised and/or new versions of
 the GNU General Public License from time to time.  Such new versions will
@@ -550,7 +558,7 @@
 public statement of acceptance of any version is permanent
 authorization for you to choose that version for the Program.
 
-  15.[11, 12] Disclaimer of Warranty and Limitation of Liability.
+  16.[11, 12] Disclaimer of Warranty and Limitation of Liability.
 
   THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
 APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT