merge of '0720bd0a82c8392e4c15a280ce7075eb650da9ac'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 24 May 2007 10:26:11 +0000 (10:26 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 24 May 2007 10:26:11 +0000 (10:26 +0000)
     and 'f723de6f15ca3447e4e22884140a9ef28095df81'


Trivial merge