merge of '151f96332675f5008c225f4aa580dcaaea8f04f8'
authorHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 09:17:12 +0000 (09:17 +0000)
committerHolger Freyther <zecke@selfish.org>
Fri, 28 Jul 2006 09:17:12 +0000 (09:17 +0000)
commit426e9988e8f1fba2a417fc05a46f280dc811ccd3
treeaf37b4c00ff61640917a8440790172613461c549
parent21ae3fadaf0af5fdb99f169b67b2eb894006def2
parent2dbbccecdb8f308df046e2e0d1b0ed516e634e6c
Merge ... '151f96332675f5008c225f4aa580dcaaea8f04f8'
     and '89e38da8206b15620ba7c2bef11c31e2dda99dd8'