merge of '25889b95fd1b6dbf67f1c12c4b431ef3b5f56abd'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 12 Apr 2007 06:00:49 +0000 (06:00 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 12 Apr 2007 06:00:49 +0000 (06:00 +0000)
     and '605b3c5dbcbd0084c6c36225f96eea919093247a'


Trivial merge