merge of '122eeaf13917f2390126c38cbde2f7e519a5709c'
authorHolger Freyther <zecke@selfish.org>
Sat, 19 Aug 2006 09:15:43 +0000 (09:15 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 19 Aug 2006 09:15:43 +0000 (09:15 +0000)
     and '7f2837654b6e146fe435c75d55d0e5f8440a2756'


Trivial merge