merge of '239bf9442698f4db4f07daf718bd532f57820a9a'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 16:19:56 +0000 (16:19 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 11 Jun 2007 16:19:56 +0000 (16:19 +0000)
     and 'c0c18499bc6e8b5a120c2a0fb0abac48a79dbf54'


Trivial merge