merge of '65710bca464cc1c83f13f67af1f184e2dd527e19'
authorMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:13:15 +0000 (17:13 +0000)
committerMatthias Hentges <oe@hentges.net>
Thu, 24 May 2007 17:13:15 +0000 (17:13 +0000)
     and '6de428a857bac350bf056ed06d55fadf87e2506d'


Trivial merge