merge of '5c05d65c9dd90a63a937c3b8da02ae5f8af28a21'
authorHolger Freyther <zecke@selfish.org>
Sun, 20 Jan 2008 11:01:00 +0000 (11:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 20 Jan 2008 11:01:00 +0000 (11:01 +0000)
     and 'd1820625c87154f827396b5afbc6cac762157b01'


Trivial merge