Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Sun, 17 Feb 2008 14:28:43 +0000 (15:28 +0100)
committerStefano Zacchiroli <zack@debian.org>
Sun, 17 Feb 2008 14:28:43 +0000 (15:28 +0100)

Trivial merge