Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Wed, 9 Jan 2008 09:34:10 +0000 (10:34 +0100)
committerStefano Zacchiroli <zack@debian.org>
Wed, 9 Jan 2008 09:34:10 +0000 (10:34 +0100)

Trivial merge