Merge ../src.temp
authorLars Wirzenius <liw@pieni.net>
Tue, 24 Nov 2009 14:30:21 +0000 (16:30 +0200)
committerLars Wirzenius <liw@pieni.net>
Tue, 24 Nov 2009 14:30:21 +0000 (16:30 +0200)

Trivial merge