merge of '740568b10a465e2c82673155e6c544f4bf1fd4c3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 11:18:00 +0000 (11:18 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Dec 2006 11:18:00 +0000 (11:18 +0000)
     and '76e7f9f8a56e5ea977d7491ec4871f97befb0507'


Trivial merge