merge of '29262672242dce33a5d94bf91091b9a5a7ea7621'
authorMatthias Hentges <oe@hentges.net>
Fri, 1 Jun 2007 23:29:44 +0000 (23:29 +0000)
committerMatthias Hentges <oe@hentges.net>
Fri, 1 Jun 2007 23:29:44 +0000 (23:29 +0000)
     and '9f671f6c3a17dbd8450e267353cf95d120238e50'


Trivial merge