merge of '6f1ed32f3107efcffe73ac9ab6ad5ae91a60c3da'
authorHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:21:09 +0000 (22:21 +0000)
committerHolger Freyther <zecke@selfish.org>
Sat, 11 Nov 2006 22:21:09 +0000 (22:21 +0000)
     and 'c64b8ff663e5e621de3a4bdde27cd3216dce0676'


Trivial merge