merge of '0340844fa6dec3078e66fa33da6ff6e42090cf32'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 11:43:58 +0000 (11:43 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Thu, 13 Dec 2007 11:43:58 +0000 (11:43 +0000)
     and '5e41bb4f3a91a4ca575844d0563d02e7659d4217'


Trivial merge