merge of '6c16fb38b0e12103704f2bd628944f23673cd55e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 15 Jul 2007 23:44:16 +0000 (23:44 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 15 Jul 2007 23:44:16 +0000 (23:44 +0000)
     and 'a90a8d2ce8fe66cb43f748e3b5dfef9416878951'


Trivial merge