Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki

[wiki.git] / user / bernie

diff --git a/user/bernie b/user/bernie
index be3a01db04b3000ba6f4d66d364dbbc9231c2305..248f5ce4a01d9adb067c7697faee05bd9a9f70da 100644 (file)
--- a/user/bernie
+++ b/user/bernie
@@ -1,15 +1,15 @@
 == Bernardo "bernie" Innocenti ==
+{{BernieAvatar179x179.png|My hackergotchi}}
+|| {{BernieX200s.jpg | maxwidth=640 | Bernie Innocenti with his trusty Lenovo X200s (Aug 2009)}} || {{BernieXo.jpg | maxwidth=640 | Bernie Innocenti with a B2-test XO laptop (Florence, Nov 2008)}} || \\
+{{pictures/bernie/FujiSanBernieSan.jpg | maxwidth=800 | Fuji San, Bernie San (Hakone, Apr 2009)}} \\
 
-{{BernieAvatar179x179.png}}
+=== Hacking everywhere ===
+|| {{pictures/bernie/bernie-desk-fsf.jpg | maxwidth=640 | My desk at the Free Software Foundation (Bosoton, Nov 2010)}} || {{pictures/bernie/bernie-mozambique.jpg | maxwidth=640 | OLPC mission to Mozambique (Matola, Sep 2010) }} ||
+|| {{pictures/bernie/bernie-desk-paraguay.jpg | maxwidth=640 | My desk at Paraguay Educa (Asuncion, Jan 2009) }} || {{pictures/bernie/bernie-desk-nepal.jpg | maxwidth=640 | My desk at OLE Nepal (Kathmandu, Jul 2008) }} ||
+|| {{pictures/bernie/bernie-desk-olpc.jpg | maxwidth=640 | My desk at One Laptop Per child (Cambridge, May 2007) }} ||
+|| {{pictures/bernie/bernie-desk-develer-2.0.jpg | maxwidth=640 | My desk at Develer 2.0 (Campi Bisenzio, May 2006) }} || {{pictures/bernie/bernie-desk-develer-1.0.jpg | maxwidth=640 | My desk at Develer 1.0 (Firenze, Jun 2005) }} ||
 
-(the [[FrontPage]] contains my hCard)
-
-{{BernieXo.jpg | maxwidth=640 | Bernie Innocenti with a B2-test XO laptop (Nov 2008)}}
-{{BernieX200s.jpg | maxwidth=640 | Bernie Innocenti with his trusty Lenovo X200s (Aug 2009)}}
-
-More pictures here: [[http://www.flickr.com/search/?q=Bernardo+Innocenti]]
-
-See also: [[BernieSchool]] [[MedicalRecords]] [[ContactInformation]]
+See also: [[ContactInformation]] [[MedicalRecords]] [[BernieSchool]] [[http://www.flickr.com/search/?q=Bernardo+Innocenti|Photos on Flick'r]]
 
 ---
 [[category/user]]