merge of '64a406be5c1819c15b47d3a2a9b566ff3f852846'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 20:53:09 +0000 (20:53 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 8 Feb 2007 20:53:09 +0000 (20:53 +0000)
     and '872186a5cf1f2d2cfc620d31ff4acf448471122e'


Trivial merge