merge of '0ce1ec91df499539b43f53a80718a77449b22b6b'
authorHolger Freyther <zecke@selfish.org>
Sun, 20 Jan 2008 23:26:42 +0000 (23:26 +0000)
committerHolger Freyther <zecke@selfish.org>
Sun, 20 Jan 2008 23:26:42 +0000 (23:26 +0000)
commitaec9181a9db40d5b13a7c2111acc4e76191ba194
tree590d78998cb35aaac148ea093e768b22a4f741c9
parentccafa170e67af9c7d9739ba47eb53a002ab2ab20
parent11434035bf87301cddff91550ecc865499a0adcc
Merge ... '0ce1ec91df499539b43f53a80718a77449b22b6b'
     and 'f1621de24fc1acbb89be67256867ca01cea8c10d'