merge of '22194037a32f6de23fd28a12aec379cb884388b7'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Mar 2007 16:42:50 +0000 (16:42 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 16 Mar 2007 16:42:50 +0000 (16:42 +0000)
     and 'b9293118c194a01c44b71ffff72e461a3fe86807'


Trivial merge