merge of '074f227db84b62ec3c531c61efcd62fc6b429dc3'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 19 Dec 2007 10:02:27 +0000 (10:02 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 19 Dec 2007 10:02:27 +0000 (10:02 +0000)
     and '5af64e0f29377b9ebbc655af469dd70d6a2f6dfb'


Trivial merge