Merge branch 'master' of ssh://pieni.net/home/liw/effi-wiki/src
authorLars Wirzenius <liw@liw.fi>
Mon, 13 Dec 2010 13:33:56 +0000 (13:33 +0000)
committerLars Wirzenius <liw@liw.fi>
Mon, 13 Dec 2010 13:33:56 +0000 (13:33 +0000)

Trivial merge