merge of '5b2b2941e7e4881e571d056410b3ef2263b250e5'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 09:05:50 +0000 (09:05 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 31 May 2007 09:05:50 +0000 (09:05 +0000)
     and '901164f6a5d50bc1f20f96bb73165ccb97935f9c'


Trivial merge