merge of '2436a8cf0f1e75038f7abdde2b335ec87e4787c2'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 14 Jul 2007 11:30:13 +0000 (11:30 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 14 Jul 2007 11:30:13 +0000 (11:30 +0000)
     and '5435d6cca1d4e6591c2820a722218a23661342bb'


Trivial merge