Merge ../src
authorLars Wirzenius <liw@pieni.net>
Sun, 3 May 2009 13:47:45 +0000 (16:47 +0300)
committerLars Wirzenius <liw@pieni.net>
Sun, 3 May 2009 13:47:45 +0000 (16:47 +0300)

Trivial merge