merge of '0fc25c0f2420f554e8c8acaff2236e25542cca15'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 22 Aug 2008 16:27:27 +0000 (16:27 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 22 Aug 2008 16:27:27 +0000 (16:27 +0000)
     and 'a9cd11891042f0feacf08c33d9bb44f0448e8346'


Trivial merge