merge of 'b802ffe5a3ad259c0df31c26d3801fe6bf2dd1fe'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 22 Jan 2007 22:28:18 +0000 (22:28 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 22 Jan 2007 22:28:18 +0000 (22:28 +0000)
     and 'cf72726f6215462575ee79ca4d8b07a3c682eb02'


Trivial merge