merge of 'cfa8d2cb144f036d07edfe4d470a48c730645c51'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 10:44:09 +0000 (10:44 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 10:44:09 +0000 (10:44 +0000)
     and 'ecb4fee9caf41418d84ee584a9cfb8c44069260a'


Trivial merge