merge of '57fa0ccbbdbca8c188108e3c4fbde4702976f3c6'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 29 Jun 2007 23:21:52 +0000 (23:21 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 29 Jun 2007 23:21:52 +0000 (23:21 +0000)
     and 'b29b99ceeb63af04c2736ab8176705046dc326c0'


Trivial merge