Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 15 May 2008 19:55:23 +0000 (21:55 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 15 May 2008 19:55:23 +0000 (21:55 +0200)

Trivial merge