Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Thu, 28 Feb 2008 12:59:42 +0000 (13:59 +0100)
committerStefano Zacchiroli <zack@debian.org>
Thu, 28 Feb 2008 12:59:42 +0000 (13:59 +0100)

Trivial merge