Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Sun, 19 Oct 2008 01:17:45 +0000 (20:17 -0500)
committerStefano Zacchiroli <zack@upsilon.cc>
Sun, 19 Oct 2008 01:17:45 +0000 (20:17 -0500)

Trivial merge