Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sat, 8 Mar 2008 11:59:41 +0000 (12:59 +0100)
committerStefano Zacchiroli <zack@upsilon.cc>
Sat, 8 Mar 2008 11:59:41 +0000 (12:59 +0100)

Trivial merge