[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[darin at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit c33b078cb7e3070c0f5b85115bb38ece04d53e37
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 01:33:03 2010 +0000

    * page/MediaCanStartListener.h: Fixed license.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54851 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 9940102..556561f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,9 @@
 2010-02-16  Darin Adler  <darin at apple.com>
 
+        * page/MediaCanStartListener.h: Fixed license.
+
+2010-02-16  Darin Adler  <darin at apple.com>
+
         Reviewed by Sam Weinig.
 
         Generalize delayed plug-in start for background tabs for use for other media
diff --git a/WebCore/page/MediaCanStartListener.h b/WebCore/page/MediaCanStartListener.h
index 005124b..317babf 100644
--- a/WebCore/page/MediaCanStartListener.h
+++ b/WebCore/page/MediaCanStartListener.h
@@ -10,10 +10,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

-- 
WebKit Debian packaging