merge of '4e2ecbe3b531720352dbfdff640946f0773a6bb4'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 21 May 2007 09:09:33 +0000 (09:09 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Mon, 21 May 2007 09:09:33 +0000 (09:09 +0000)
     and 'c876168ea7f3cb64f08c25751c96b9565172329c'


Trivial merge