Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 5 Jun 2008 09:47:45 +0000 (11:47 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 5 Jun 2008 09:47:45 +0000 (11:47 +0200)

Trivial merge