merge of '2b9fbd2b94d0dd1a3b6560f1e64c3ba54d0491c9'
authorHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 15:58:15 +0000 (15:58 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 15:58:15 +0000 (15:58 +0000)
commit5d3963de4a236f1a28f4c5c0829d0492141ea505
treebd9944aa6f69adeb8c1e630cb89a9ce12d8854c9
parent0a9ddb4c6b3f4fe6a13cb01a92f0abf152ad5919
parentf4a53b765a6801f836586b5ee662b5f9392dcfab
Merge ... '2b9fbd2b94d0dd1a3b6560f1e64c3ba54d0491c9'
     and 'a1ada670e1090a4a0d8aeca19ac7ce206efe34ba'