merge of '04cd7b14ad574131ab6b03984f2d0bd53c6f19fc'
authorHolger Freyther <zecke@selfish.org>
Sun, 17 Sep 2006 19:35:18 +0000 (19:35 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 17 Sep 2006 19:35:18 +0000 (19:35 +0000)
     and '6388d23a0add65b7d813d1ac18c8befec1913226'


Trivial merge