Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@debian.org>
Fri, 25 Jan 2008 15:20:50 +0000 (16:20 +0100)
committerStefano Zacchiroli <zack@debian.org>
Fri, 25 Jan 2008 15:20:50 +0000 (16:20 +0100)

Trivial merge