merge of '615ba6299e98edf3a5c47976f97de62b10352bf0'
authorMatthias Hentges <oe@hentges.net>
Thu, 28 Jun 2007 22:05:38 +0000 (22:05 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 28 Jun 2007 22:05:38 +0000 (22:05 +0000)
     and '61d9290f8bf0b1072ab2cf68c220769146dace10'


Trivial merge