merge of 'aaafb999d11846eacd606047f3cddf7a583a9e0c'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Jun 2007 16:08:16 +0000 (16:08 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 21 Jun 2007 16:08:16 +0000 (16:08 +0000)
     and 'b0652ec03153efab79c1e4fedf9f6847d4695672'


Trivial merge