merge of '846bde67b99146677600ce9b3ee03f06d8c764c3'
authorMatthias Hentges <oe@hentges.net>
Fri, 23 Mar 2007 18:24:21 +0000 (18:24 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 23 Mar 2007 18:24:21 +0000 (18:24 +0000)
     and 'f0ea8dcdc5d59f269582084a643d55c9333fbc66'


Trivial merge