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)
     and 'f1621de24fc1acbb89be67256867ca01cea8c10d'


Trivial merge