merge of '378deeb40b41ec05cc902c4d69546d9f2f604c30'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 29 May 2007 00:44:53 +0000 (00:44 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 29 May 2007 00:44:53 +0000 (00:44 +0000)
     and 'abe0bb682ca88dfb40542ab379b6c2af2e84d1b4'


Trivial merge