merge of '2ab43fd44163ef54ceb8ddb42879e7220b856fbc'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 28 Jan 2008 00:30:10 +0000 (00:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 28 Jan 2008 00:30:10 +0000 (00:30 +0000)
     and 'f905ec58f78a3b42003e5e0440d048ead8ece5a3'


Trivial merge