Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 19 Apr 2008 15:26:18 +0000 (17:26 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 19 Apr 2008 15:26:18 +0000 (17:26 +0200)

Trivial merge