merge of '2095c71741c2d1d79a50f2d9ea052cada53ba7d0'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 23 May 2007 18:47:20 +0000 (18:47 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Wed, 23 May 2007 18:47:20 +0000 (18:47 +0000)
     and 'a0522e7d7dc85bbbff61ba37e7b7c0069fc5f5b5'


Trivial merge