Merge branch 'master' of fettunta.org:/home/zack/git/homepage
authorStefano Zacchiroli <zack@upsilon.cc>
Thu, 24 Apr 2008 13:48:58 +0000 (21:48 +0800)
committerStefano Zacchiroli <zack@upsilon.cc>
Thu, 24 Apr 2008 13:48:58 +0000 (21:48 +0800)

Trivial merge