Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 16 Mar 2008 17:11:31 +0000 (18:11 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 16 Mar 2008 17:11:31 +0000 (18:11 +0100)

Trivial merge