merge of '5d944267f089d88f0f7c550646a80562f5db2bb3'
authorHolger Freyther <zecke@selfish.org>
Sat, 19 May 2007 13:02:04 +0000 (13:02 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 19 May 2007 13:02:04 +0000 (13:02 +0000)
commit68443b34e6891134aeae007c48b07b7e96709d76
treef9d3e793d7e24736ccda53c87745bd48337f8a22
parentcb5c2fe5367ba99356573ca9c2c2fe427c2f9ded
parent2622b5d4fb2934a309612786ace5c8b83780c099
Merge ... '5d944267f089d88f0f7c550646a80562f5db2bb3'
     and '7d31767808424492005997d17abb894d8a3c1968'