merge of '20f86cced0cd0f3af307002570f8505ef976e07a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 15 Jun 2007 14:37:33 +0000 (14:37 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 15 Jun 2007 14:37:33 +0000 (14:37 +0000)
     and '70d9ddd6b089b40485aa1c7a16d7bfc63d80cb81'


Trivial merge