[SCM] wiki-content branch, master, updated. 5805c3594a4869b1f0054e280d61114cb894968b

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 5805c3594a4869b1f0054e280d61114cb894968b
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Jun 14 12:06:41 2011 +0200

    Adding Ubuntu to project downstream page.

diff --git a/project/downstream.mdwn b/project/downstream.mdwn
index af589d1..db5ce5d 100644
--- a/project/downstream.mdwn
+++ b/project/downstream.mdwn
@@ -246,6 +246,16 @@ More information:
 
  * [Homepage](http://www.supergrubdisk.org/rescatux/)
 
+## Ubuntu
+
+[Ubuntu](http://www.ubuntu.com/) is a Linux distribution that starts with the breadth of Debian and adds regular releases (every six months), a clear focus on the user and usability (it should "Just Work", TM) and a commitment to security updates with 18 months of support for every release. Ubuntu ships with the latest GNOME and KDE releases as well as a selection of server and desktop software that makes for a comfortable desktop experience off a single installation CD.
+
+Ubuntu is sponsored by [Canonical Ltd.](http://www.canonical.com/)
+
+More information:
+
+  * [Homepage](http://www.ubuntu.com/)
+
 ## Voyage
 
 [Voyage](http://linux.voyage.hk/) is best run on a x86 embedded platforms such as PC Engines ALIX/WRAP and Soekris 45xx/48xx boards.

-- 
wiki-content