Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 21 Jun 2008 06:22:30 +0000 (08:22 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 21 Jun 2008 06:22:30 +0000 (08:22 +0200)

Trivial merge