merge of '4628771529e2ed24d72e3df800feb7a575c330e7'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 1 May 2007 16:41:06 +0000 (16:41 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 1 May 2007 16:41:06 +0000 (16:41 +0000)
     and 'c18c0af8649c4f70f923fefaa9e42158e83c3881'


Trivial merge