Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Wed, 16 Jul 2008 13:47:50 +0000 (15:47 +0200)
committerStefano Zacchiroli <zack@upsilon.cc>
Wed, 16 Jul 2008 13:47:50 +0000 (15:47 +0200)

Trivial merge