merge of 'ed2d98bad995f47d5d9407c6f6042a4a0a16e4e8'
authorHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 09:38:10 +0000 (09:38 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 20 Aug 2006 09:38:10 +0000 (09:38 +0000)
commit64b5be90302487a5ada3dfb300baddb2b1ff7524
tree8efb4761fe107d0cbcf6f2fc84091521a2b2db03
parent821494d376ae549d48182380b8d4b5d92c913524
parent808faadfbea5deb79b4bb14c64a6e8df4c4466e4
Merge ... 'ed2d98bad995f47d5d9407c6f6042a4a0a16e4e8'
     and 'f79e480392084bdbae07670461327da526458d3c'