merge of 'b3e68096a01405d0ca9422a644f8b5d2c2a6e54c'
authorHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 20:32:03 +0000 (20:32 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 31 Mar 2007 20:32:03 +0000 (20:32 +0000)
     and 'f8de7adfcce2320064828f2c28f14f0e0e4298f4'


Trivial merge