merge of '5d944267f089d88f0f7c550646a80562f5db2bb3'
authorHolger Freyther <zecke@selfish.org>
Sat, 19 May 2007 13:02:04 +0000 (13:02 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 19 May 2007 13:02:04 +0000 (13:02 +0000)
     and '7d31767808424492005997d17abb894d8a3c1968'


Trivial merge