merge of '05bd9dc1a83a011814f8686a016c671b35e0a18e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 21:17:41 +0000 (21:17 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 21:17:41 +0000 (21:17 +0000)
     and '23c1fc66a29e279d192d2dee8c7a1603361063b7'


Trivial merge