Merge branch 'master' of ssh://pieni.net/home/liw/effi-wiki/src
authorLars Wirzenius <liw@liw.fi>
Fri, 3 Dec 2010 20:17:18 +0000 (20:17 +0000)
committerLars Wirzenius <liw@liw.fi>
Fri, 3 Dec 2010 20:17:18 +0000 (20:17 +0000)

Trivial merge