merge of '3ad0844ce9d5f38938193e537eef14f3eedc5aaa'
authorHolger Freyther <zecke@selfish.org>
Mon, 17 Mar 2008 14:19:29 +0000 (14:19 +0000)
committerHolger Freyther <zecke@selfish.org>
Mon, 17 Mar 2008 14:19:29 +0000 (14:19 +0000)
     and 'c6487ccb0affa59758f32bd6af992ddd0508d2b5'


Trivial merge