merge of '8a114c24deca9328747f14101e87db8845400833'
authorHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 19:23:13 +0000 (19:23 +0000)
committerHolger Freyther <zecke@selfish.org>
Tue, 6 Mar 2007 19:23:13 +0000 (19:23 +0000)
     and 'f02f7da26cf1279907a41d7957e054f42575adbd'


Trivial merge