merge of '44da8efcf85940e173cd83b2ea95fa7ae8782bb5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 31 Dec 2006 13:25:04 +0000 (13:25 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 31 Dec 2006 13:25:04 +0000 (13:25 +0000)
     and 'ca1dbbdd8a20d72c6e8277b66f14e016ff7b8cc2'


Trivial merge