merge of '889b38d9aefee8fdff26966f3716f5e5a12ac8be'
authorHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:40:19 +0000 (22:40 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:40:19 +0000 (22:40 +0000)
     and 'c370f7ef14194698681f362610060c2a106412ac'


Trivial merge