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)
commita441b927775fa54ee7e3bae2292719fd4c9179e9
treed883ff9a4e44b4d89e661b65a4ad42a7ae15a775
parenta324c95af6708ce6413c5b481b085ce7f1553a73
parentd70fd4ffa045998c1b579074b443354023054ef6
Merge ... '36f14d73e014c31eddebc1591ca83ba7baf264fe'
     and '5fdb0dc4b9d46e93ef2f8167972489b652ad5830'