merge of '453235132f7854f1822704d1398a978b23b4a64a'
authorHolger Freyther <zecke@selfish.org>
Sat, 15 Mar 2008 21:00:02 +0000 (21:00 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 15 Mar 2008 21:00:02 +0000 (21:00 +0000)
     and 'be98f2c49ea68651e064574cc2379f2e04febe3c'


Trivial merge