[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit f7d49371e7d5b0baed2993db95b61bf5091b8337
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 27 06:32:56 2003 +0000

    Remove the word "Merlot".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5272 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 031c0c6..25d32e0 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -12,7 +12,7 @@
 
         Reviewed by Maciej.
 
-        - fixed 3463586 -- WebCore does not compile with new definition of NULL in Merlot
+        - fixed 3463586 -- WebCore does not compile with new definition of NULL
 
         * khtml/khtml_part.cpp: (findWordBoundary): Changed NULL to 0 and did a little code
         cleanup of the surrounding code.

-- 
WebKit Debian packaging