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

[hyatt]

The following commit has been merged in the debian/unstable branch:
commit 9f4dd4989acf3a8d7c3b5ba593e35dd85914da08
Author: hyatt <hyatt at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 4 17:39:47 2003 +0000

    	Fix for 3218085.  Remove the bogus 2cm print rule for body in the
    	html4.css sheet.
    
            Reviewed by darin/trey
    
            * khtml/css/html4.css:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 152340f..3fdd69e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-04-04  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3218085.  Remove the bogus 2cm print rule for body in the
+	html4.css sheet.
+	
+        Reviewed by darin/trey
+
+        * khtml/css/html4.css:
+
 2003-04-04  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 152340f..3fdd69e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-04-04  David Hyatt  <hyatt at apple.com>
+
+	Fix for 3218085.  Remove the bogus 2cm print rule for body in the
+	html4.css sheet.
+	
+        Reviewed by darin/trey
+
+        * khtml/css/html4.css:
+
 2003-04-04  Darin Adler  <darin at apple.com>
 
         Reviewed by Ken.
diff --git a/WebCore/khtml/css/html4.css b/WebCore/khtml/css/html4.css
index cc7ef8d..eaa36a8 100644
--- a/WebCore/khtml/css/html4.css
+++ b/WebCore/khtml/css/html4.css
@@ -43,18 +43,9 @@ script {
  * generic block level elements
  */
 
- at media print {
-	body {
-		display: block;
-		margin: 2cm;
-	}
-}
-
- at media screen {
-	body {
-		display: block;
-		margin: 8px;
-	}
+body {
+    display: block;
+    margin: 8px;
 }
 
 p {

-- 
WebKit Debian packaging