[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d76566b14ac0c01c402280b319cb043f9aeddb4b
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 18 13:19:11 2009 +0000

    Clarify and simplify the legal section in the overview documentation,
    after review with our legal team.
    
    Reviewed by Tor Arne Vestbø.
    
    * docs/qtwebkit.qdoc:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51107 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 00cdf2a..fe1260d 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-18  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Clarify and simplify the legal section in the overview documentation,
+        after review with our legal team.
+
+        * docs/qtwebkit.qdoc:
+
 2009-11-18  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/docs/qtwebkit.qdoc b/WebKit/qt/docs/qtwebkit.qdoc
index 09dfae5..411762a 100644
--- a/WebKit/qt/docs/qtwebkit.qdoc
+++ b/WebKit/qt/docs/qtwebkit.qdoc
@@ -25,13 +25,10 @@
 
     Qt Commercial Edition licensees that wish to distribute applications that
     use the QtWebKit module need to be aware of their obligations under the
-    GNU Lesser General Public License (LGPL). 
+    GNU Library General Public License (LGPL).
 
     Developers using the Open Source Edition can choose to redistribute
-    the module under the appropriate version of the GNU LGPL; version 2.1
-    for applications and libraries licensed under the GNU GPL version 2,
-    or version 3 for applications and libraries licensed under the GNU
-    GPL version 2.
+    the module under the appropriate version of the GNU LGPL.
 
     \legalese
     WebKit is licensed under the GNU Library General Public License.

-- 
WebKit Debian packaging