merge of '0fe51495ad822c39d441e76fe38da75d576761b0'
authorHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 19:05:09 +0000 (19:05 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 19:05:09 +0000 (19:05 +0000)
     and 'a73ca61dee044168d70737f0c38567b825b10fb9'


Trivial merge