[SCM] wiki-content branch, master, updated. 6165862d8b99f535772b49df55635362058fb0b7

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 6165862d8b99f535772b49df55635362058fb0b7
Author: Daniel Baumann <daniel at debian.org>
Date:   Tue Aug 10 04:44:11 2010 +0200

    Adding entries for canonical and linaro to project downstream page, thanks to Cody A.W. Somerville <cody.somerville at canonical.com>.

diff --git a/project/downstream.mdwn b/project/downstream.mdwn
index f80e334..9442309 100644
--- a/project/downstream.mdwn
+++ b/project/downstream.mdwn
@@ -18,6 +18,15 @@ More information:
 
   * [Homepage](http://www.clonezilla.org/)
 
+## Canonical OEM Services
+
+Canonical provides custom development services to help companies benefit from the power of Linux. Canonical's developers undertake development projects ranging from customising Ubuntu and full product life-cycle software development to providing embedded systems and architectural ports.
+
+More information:
+
+  * [Homepage](http://www.canonical.com)
+  * [Engineering Services](http://www.canonical.com/engineering-services)
+
 ## Debian Eee PC
 
 The goal of the [Debian Eee PC](http://wiki.debian.org/DebianEeePC/) project is full support for the ASUS Eee PC in Debian.
@@ -100,6 +109,14 @@ More information:
 
   * [Homepage](http://imedias.ch/lernstick/)
 
+## Linaro
+
+[Linaro](http://www.linaro.org/) brings together the open source community and the electronics industry to work on key projects, deliver great tools, reduce industry wide fragmentation and provide common foundations for Linux software distributions and stacks to land on.
+
+More information:
+
+  * [Homepage](http://www.linaro.org/)
+
 ## OpenMediaVault
 
 [OpenMediaVault](http://www.openmediavault.org/) is a network attached storage (NAS) solution. It contains services like SSH, (S)FTP, SMB/CIFS, AFS, UPnP media server, DAAP media server, RSync, DDNS, BitTorrent client and many more.

-- 
wiki-content