Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 12 Oct 2008 19:51:54 +0000 (21:51 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 12 Oct 2008 19:51:54 +0000 (21:51 +0200)

Trivial merge