[SCM] wiki-content branch, master, updated. bc1cc8490af288bc62791c0b222d3d9280a9095e

[Daniel Baumann]

The following commit has been merged in the master branch:
commit bc1cc8490af288bc62791c0b222d3d9280a9095e
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 27 23:23:38 2010 +0100

    Adding Canaima on project downstream page.

diff --git a/project/downstream.mdwn b/project/downstream.mdwn
index 9d6a0d6..de416e8 100644
--- a/project/downstream.mdwn
+++ b/project/downstream.mdwn
@@ -10,6 +10,15 @@ More information:
 
   * [Homepage](http://amnesia.boum.org/)
 
+## Canaima
+
+[Canaima](http://canaima.softwarelibre.gob.ve/) aims to be specifically designed for office users in the Venezuelan national government, as a response to a presidential decree that prioritizes the use of free technologies and determines a transition process.
+
+More information:
+
+  * [Homepage](http://canaima.softwarelibre.gob.ve/)
+  * [Wikipedia](http://en.wikipedia.org/wiki/Canaima_(software))
+
 ## 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.

-- 
wiki-content