== Current Affiliations ==
-Coordinator of the Infrastructure Team, member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
+Coordinator of the Infrastructure Team, Member of the Oversight Board, [[http://wiki.sugarlabs.org/ | Sugar Labs]]
[[http://wiki.sugarlabs.org/ | http://static.sugarlabs.org/images/sugarlabs_trac_logo.png]]
Software Engineer, [[http://www.google.com/|Google Inc.]]
-[[http://www.google.com/ | http://www.google.com/images/logos/google_logo_41.png]]
+[[http://www.google.com/ | GoogleLogoAlpha.png]]
----
-Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
+Member, [[http://fsf.org/ | Free Software Foundation]]
[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
----
-Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
-
-[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
-
-----
-
Proven Packager, Sponsor, [[http://www.fedoraproject.org/ | Fedora Project]]
[[http://fedoraproject.org | http://fedoraproject.org/w/uploads/thumb/2/2d/Logo_fedoralogo.png/320px-Logo_fedoralogo.png ]]
----
-Founder, [[http://www.develer.com/ | Develer s.r.l. ]]
+Founder, [[http://www.develer.com/ | Develer s.r.l.]]
[[http://www.develer.com/ | http://www.develer.com/pics/develer_logo_alpha.png]]
== Former Affiliations ==
- * Contributor, [[http://uclinux.org/ | uClinux]]
+Senior Systems Administrator, [[http://fsf.org/ | Free Software Foundation]]
+
+[[http://fsf.org/ | http://static.fsf.org/fsforg/img/logo-new.png]]
+
+----
+
+Release Manager, [[ http://paraguayeduca.org | Paraguay Educa ]]
+
+[[http://paraguayeduca.org | ParaguayEduca.jpg ]]
+
+----
+
+Operating System Engineer (full-time volunteer), [[http://laptop.org/ | One Laptop Per Child]]
+
+[[http://laptop.org/ | OlpcLogoAlpha.png]]
+
+----
+
+Contributor, [[http://uclinux.org/ | uClinux]]
- * Developer, [[http://laptop.org/ | OLPC]]
+[[http://uclinux.org/ | http://www.uclinux.org/images/logo.gif]]