Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 6 Apr 2008 20:38:49 +0000 (22:38 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 6 Apr 2008 20:38:49 +0000 (22:38 +0200)

Trivial merge