merge of 'b97fbd848f55a36ddcbe0d79f43f05ef9a7d330a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 2 Apr 2007 11:07:35 +0000 (11:07 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 2 Apr 2007 11:07:35 +0000 (11:07 +0000)
     and 'd50a4dd71075477161f6df6b48b8429a78785389'


Trivial merge