merge of '0bce6a5194a4bb1f18f55b0dffee505b24073d3f'
authorHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 12:39:52 +0000 (12:39 +0000)
committerHolger Freyther <zecke@selfish.org>
Wed, 12 Mar 2008 12:39:52 +0000 (12:39 +0000)
commit5375dca014dd563f1dd5c86389f0ef2989542fe9
tree4f29bba7305440ff72ae21869f5c35b8b074a50f
parent72bbade2b07c4701d0b35f0b3a21d81201302c1c
parent9b6378f85f45219de8153203e97f94c6524716ab
Merge ... '0bce6a5194a4bb1f18f55b0dffee505b24073d3f'
     and '808dfc9a89643b5a9911166b217da753005549e9'