merge of '3579ac09e8e10d063bab31763cf0dc021524d1ab'
authorMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:12:21 +0000 (17:12 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:12:21 +0000 (17:12 +0000)
     and '525da879e18fe44693d21190037ee338ebf62c86'


Trivial merge