merge of '4db65ff4d445af594f29654a717fe9afb23c9991'
authorMatthias Hentges <oe@hentges.net>
Wed, 8 Nov 2006 01:13:06 +0000 (01:13 +0000)
committerMatthias Hentges <oe@hentges.net>
Wed, 8 Nov 2006 01:13:06 +0000 (01:13 +0000)
     and '63b52e6e1932114d89a94f814a2bf1ffd922e4b4'


Trivial merge