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

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 55fb8f3b1399d55f28b6a7feade0ba4c1925db6d
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 9 20:58:33 2010 +0000

    Add a link to the Contributors Meeting registration form in the sidebar
    
    Rubber-stamped in advance by Adele Peterson.
    
    * nav.inc: Added a link underneath "Trac".
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55740 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitSite/ChangeLog b/WebKitSite/ChangeLog
index 7bf2d21..226ade3 100644
--- a/WebKitSite/ChangeLog
+++ b/WebKitSite/ChangeLog
@@ -1,3 +1,12 @@
+2010-03-09  Adam Roben  <aroben at apple.com>
+
+        Add a link to the Contributors Meeting registration form in the
+        sidebar
+
+        Rubber-stamped in advance by Adele Peterson.
+
+        * nav.inc: Added a link underneath "Trac".
+
 2010-02-26  Sam Weinig  <sam at webkit.org>
 
         Rubber-stamped by Adele Peterson.
diff --git a/WebKitSite/nav.inc b/WebKitSite/nav.inc
index 8f84d3b..f576e8d 100644
--- a/WebKitSite/nav.inc
+++ b/WebKitSite/nav.inc
@@ -6,6 +6,7 @@
         <li><a href="/projects/goals.html">Project Goals</a></li>
         <li><a href="/contact.html">Keeping in Touch</a></li>
         <li><a href="http://trac.webkit.org/">Trac</a></li>
+        <li><a href="/meeting/">Contributors Meeting</a></li>
 
         <li class="subtitle">Working with the Code</li>
 

-- 
WebKit Debian packaging