merge of '10c20f13828f71806f4d990010db22c15e357aee'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:15:43 +0000 (14:15 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 14 Jan 2008 14:15:43 +0000 (14:15 +0000)
     and 'fcb60e20d2bda504bfd7af6775c815a4c014185e'


Trivial merge