merge of '481cda07f650eec08e83f5f63d522be2fbcb6ff1'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:37:42 +0000 (13:37 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:37:42 +0000 (13:37 +0000)
     and '75bc4e3a2d2ba7222114e2b45642c31b8e2057dd'


Trivial merge