merge of '862020d539b671d14575834bfda296adc8ef20ec'
authorMatthias Hentges <oe@hentges.net>
Sun, 24 Jun 2007 20:40:27 +0000 (20:40 +0000)
committerMatthias Hentges <oe@hentges.net>
Sun, 24 Jun 2007 20:40:27 +0000 (20:40 +0000)
     and 'beb9be9b22208b02578f8cc4ad29efb48be52977'


Trivial merge