merge of 'cae3b4333167ab63d418dcd8fac25afe9618f558'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 2 Apr 2007 11:01:21 +0000 (11:01 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 2 Apr 2007 11:01:21 +0000 (11:01 +0000)
     and 'ef4213537fde8f688658cbb0ae500c5e4fbfa8bf'


Trivial merge