Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 3 Apr 2008 12:13:32 +0000 (14:13 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 3 Apr 2008 12:13:32 +0000 (14:13 +0200)

Trivial merge