Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Thu, 20 Dec 2007 19:02:51 +0000 (20:02 +0100)
committerStefano Zacchiroli <zack@debian.org>
Thu, 20 Dec 2007 19:02:51 +0000 (20:02 +0100)

Trivial merge