merge of '36f14d73e014c31eddebc1591ca83ba7baf264fe'
authorHolger Freyther <zecke@selfish.org>
Thu, 31 May 2007 11:50:04 +0000 (11:50 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 31 May 2007 11:50:04 +0000 (11:50 +0000)
     and '5fdb0dc4b9d46e93ef2f8167972489b652ad5830'


Trivial merge