merge of '66ac81e5457735c2fdeaffebbea0e83ef0b97877'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 21:00:38 +0000 (21:00 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sun, 10 Dec 2006 21:00:38 +0000 (21:00 +0000)
     and 'f364e3e809950cf1c1059b61206516bd02506cf9'


Trivial merge