From 218e0e188a298a102d2579237a546af6c7ab9884 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@gnome.org>
Date: Tue, 25 Nov 2008 20:22:08 +0000
Subject: [PATCH] Link to Grancanaria dates PR.

2008-11-25  Behdad Esfahbod  <behdad@gnome.org>

        * foundation.gnome.org/index.wml:
        * foundation.gnome.org/news/index.wml:
        Link to Grancanaria dates PR.


svn path=/trunk/; revision=452
---
 ChangeLog                           |  6 ++++++
 foundation.gnome.org/index.wml      | 11 +++++++++++
 foundation.gnome.org/news/index.wml | 12 ++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 86c16aa..edecb20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-11-25  Behdad Esfahbod  <behdad@gnome.org>
+
+	* foundation.gnome.org/index.wml:
+	* foundation.gnome.org/news/index.wml:
+	Link to Grancanaria dates PR.
+
 2008-11-03  Vincent Untz  <vuntz@gnome.org>
 
 	* foundation.gnome.org/index.wml:
diff --git a/foundation.gnome.org/index.wml b/foundation.gnome.org/index.wml
index da9b479..05e8899 100644
--- a/foundation.gnome.org/index.wml
+++ b/foundation.gnome.org/index.wml
@@ -40,6 +40,17 @@
 
     <h2>News</h2>
     <ul>
+      <li>
+        <strong>Gran Canaria Desktop Summit 2009 to be held July 3-11, 2009</strong>
+	<small>(2008-11-25)</small>
+	<blockquote>
+	  The inaugural Desktop Summit, uniting the flagship conferences of
+	  the GNOME and KDE communities, GUADEC and Akademy, will be held in
+	  Gran Canaria, Canary Islands, Spain the week of July 3-11, 2009.
+          <a href="http://www.gnome.org/press/releases/2008-11-25-grancanaria.html">Read
+          more</a>
+        </blockquote>
+      </li>
       <li>
         <strong>Google and Motorola join the GNOME Foundation Advisory Board</strong>
         <small>(2008-11-03)</small>
diff --git a/foundation.gnome.org/news/index.wml b/foundation.gnome.org/news/index.wml
index 4e0c5fc..2da586b 100644
--- a/foundation.gnome.org/news/index.wml
+++ b/foundation.gnome.org/news/index.wml
@@ -12,6 +12,18 @@
     <h1>GNOME Foundation News</h1>
 
     <ul>
+      <li>
+        <strong>Gran Canaria Desktop Summit 2009 to be held July 3-11, 2009</strong>
+	<small>(2008-11-25)</small>
+	<blockquote>
+	  The inaugural Desktop Summit, uniting the flagship conferences of
+	  the GNOME and KDE communities, GUADEC and Akademy, will be held in
+	  Gran Canaria, Canary Islands, Spain the week of July 3-11, 2009.
+          <a href="http://www.gnome.org/press/releases/2008-11-25-grancanaria.html">Read
+          more</a>
+        </blockquote>
+      </li>
+
       <li>
         <strong>Google and Motorola join the GNOME Foundation Advisory Board</strong>
         <small>(2008-11-03)</small>