merge of '5e43d3e4f15cce50de048baf7164796af353cd26'
authorHolger Freyther <zecke@selfish.org>
Mon, 17 Dec 2007 18:34:31 +0000 (18:34 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 17 Dec 2007 18:34:31 +0000 (18:34 +0000)
     and '67b120742df5594a3735d002b5adef97a2e7811c'


Trivial merge