merge of '66da92b8617b2b12ed4b88764898faf67c060098'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 9 Jun 2007 00:33:04 +0000 (00:33 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 9 Jun 2007 00:33:04 +0000 (00:33 +0000)
     and 'ffb800106daf409e2cc662fcf7e757d10a3c9843'


Trivial merge