diff -r 41300fa6a67c -r f7bc934e204c src/3rdparty/webkit/ChangeLog
--- a/src/3rdparty/webkit/ChangeLog	Tue Feb 02 00:43:10 2010 +0200
+++ b/src/3rdparty/webkit/ChangeLog	Wed Mar 31 11:06:36 2010 +0300
@@ -1,3 +1,11 @@
+2010-02-18  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        Add .gitattributes file for custom ChangeLog merge-driver
+
+        * .gitattributes: Added.
+
 2009-11-30  Jan-Arve Sæther  <jan-arve.saether@nokia.com>
 
         Reviewed by Simon Hausmann.