merge of '5a27dc2251870d3b0fba8216aa90a9b93350f68e'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Aug 2008 00:26:51 +0000 (00:26 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 20 Aug 2008 00:26:51 +0000 (00:26 +0000)
     and 'f94b55ab9207117d34fe0171c0ec596dc4ac85b5'


Trivial merge