merge of '1d81bf38470b2447c375082a9a8b46bfeb3e76b3'
authorHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 21:01:12 +0000 (21:01 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 1 Apr 2007 21:01:12 +0000 (21:01 +0000)
commitcfe6c7d0e4cfe1f5281d684e7cf64ce51e7363bc
treeab7bd85cb52f30146ec559a44697352e7ca53b44
parent7feebc96df1b509f63cfa846a4aa68d3c958e1e8
parenta668b728f034349c1204be9be1b363b1cb3aefa2
Merge ... '1d81bf38470b2447c375082a9a8b46bfeb3e76b3'
     and '4d6a07a1830f155b9a2a7a992d78b6bf7d7c18f2'