merge of '51a33385cc433c55cd19bd8dc3705adb1e86f59a'
authorHolger Freyther <zecke@selfish.org>
Thu, 24 May 2007 17:37:46 +0000 (17:37 +0000)
committerHolger Freyther <zecke@selfish.org>
Thu, 24 May 2007 17:37:46 +0000 (17:37 +0000)
commita8c47c130cc6f87bd62bede1d276090dbf909f48
treec0d99e412acbca9d3c3b9ab06180f6f234fe45e6
parent1c6e2c60fd35e5272298c62fb9e9fa5c13aa9806
parentc2d4f57002933523cebd64df07e3a4384ca6c655
Merge ... '51a33385cc433c55cd19bd8dc3705adb1e86f59a'
     and '7efadd625919e78e49dfd108fff87b192f63f3fa'