Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 1 Jul 2008 19:42:03 +0000 (21:42 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 1 Jul 2008 19:42:03 +0000 (21:42 +0200)

Trivial merge