merge of '42c1f8fc2e2320defc4c39f093a87c49b1af3656'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:22:30 +0000 (19:22 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 7 May 2007 19:22:30 +0000 (19:22 +0000)
     and 'a8c7b34eb970f67785d063b6597433fea669b5dd'


Trivial merge