Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Tue, 11 Nov 2008 12:02:39 +0000 (13:02 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Tue, 11 Nov 2008 12:02:39 +0000 (13:02 +0100)

Trivial merge