Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Fri, 1 Aug 2008 15:15:40 +0000 (17:15 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Fri, 1 Aug 2008 15:15:40 +0000 (17:15 +0200)

Trivial merge