merge of '88df3da823d2bce88856c558a8edb5e19f13c6dc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 15 Dec 2006 16:18:39 +0000 (16:18 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 15 Dec 2006 16:18:39 +0000 (16:18 +0000)
     and 'b69e1fa3c948f1b457f68d8dafdae100280874ed'


Trivial merge