Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Mon, 28 Jan 2008 15:38:18 +0000 (16:38 +0100)
committerStefano Zacchiroli <zack@debian.org>
Mon, 28 Jan 2008 15:38:18 +0000 (16:38 +0100)

Trivial merge