merge of '6a57ef3dc19b0640f6623b5aa686a5c2d3f81f32'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:21:22 +0000 (19:21 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 14 Dec 2007 19:21:22 +0000 (19:21 +0000)
     and 'aa846a6b8bb5f5b8232955a54e9391889948af52'


Trivial merge