merge of '49e541f0397109bdc6530a7380f2980a60d577ba'
authorHolger Freyther <zecke@selfish.org>
Thu, 17 May 2007 17:05:45 +0000 (17:05 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 17 May 2007 17:05:45 +0000 (17:05 +0000)
commit2622b5d4fb2934a309612786ace5c8b83780c099
tree9a8a3e81a1ba22d4813f766375f3a0239e19022a
parent7605d989539a54cb2e6a00fba7cd3943bb9be7ec
parentbdb2195b34d284a1eab4a7c3dd6bc334b32a08a9
Merge ... '49e541f0397109bdc6530a7380f2980a60d577ba'
     and '5ae66edc366deb29cb20b1ba5074e69862e0d59a'